np2/x11/main.c - diff

Return to main.c CVS log

Up to [RetroPC.NET] / np2 / x11

Diff for /np2/x11/main.c between versions 1.20 and 1.22

version 1.20, 2004/07/26 15:53:26	version 1.22, 2005/03/12 12:36:13
Line 10	Line 10
* 2. Redistributions in binary form must reproduce the above copyright	* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the	* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.	* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*	*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Line 325 main(int argc, char *argv[])	Line 323 main(int argc, char *argv[])
}	}
}	}

	#if !defined(CPUCORE_IA32)
if (np2oscfg.resume) {	if (np2oscfg.resume) {
flagload(np2resumeext, "Resume", FALSE);	flagload(np2resumeext, "Resume", FALSE);
}	}
	#endif
sysmng_workclockreset();	sysmng_workclockreset();

drvmax = (argc < 4) ? argc : 4;	drvmax = (argc < 4) ? argc : 4;
Line 352 main(int argc, char *argv[])	Line 352 main(int argc, char *argv[])
joymng_deinitialize();	joymng_deinitialize();
S98_trash();	S98_trash();

	#if !defined(CPUCORE_IA32)
if (np2oscfg.resume) {	if (np2oscfg.resume) {
flagsave(np2resumeext);	flagsave(np2resumeext);
} else {	} else {
flagdelete(np2resumeext);	flagdelete(np2resumeext);
}	}
	#endif

pccore_term();	pccore_term();
debugwin_destroy();	debugwin_destroy();

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.20
changed lines
	Added in v.1.22