np2/x11/np2.c - diff

Return to np2.c CVS log

Up to [RetroPC.NET] / np2 / x11

Diff for /np2/x11/np2.c between versions 1.11 and 1.14

version 1.11, 2004/01/13 16:28:18	version 1.14, 2004/03/23 15:16:43
Line 31	Line 31
#include "pccore.h"	#include "pccore.h"
#include "dosio.h"	#include "dosio.h"
#include "scrndraw.h"	#include "scrndraw.h"
#include "statsave.h"
#include "timing.h"	#include "timing.h"
#include "toolkit.h"	#include "toolkit.h"

#include "kdispwin.h"	#include "kdispwin.h"
#include "toolwin.h"	#include "toolwin.h"
#include "viewer.h"	#include "viewer.h"
	#include "debugwin.h"

#include "commng.h"	#include "commng.h"
#include "joymng.h"	#include "joymng.h"
Line 202 flagload(const char* ext, const char* ti	Line 202 flagload(const char* ext, const char* ti

getstatfilename(path, ext, sizeof(path));	getstatfilename(path, ext, sizeof(path));
ret = statsave_check(path, buf, sizeof(buf));	ret = statsave_check(path, buf, sizeof(buf));
if (ret & (~NP2FLAG_DISKCHG)) {	if (ret & (~STATFLAG_DISKCHG)) {
fprintf(stderr, "Couldn't restart\n");	fprintf(stderr, "Couldn't restart\n");
rv = 1;	rv = 1;
} else if ((!force) && (ret & NP2FLAG_DISKCHG)) {	} else if ((!force) && (ret & STATFLAG_DISKCHG)) {
fprintf(stderr, "Conflict\n");	fprintf(stderr, "Conflict\n");
rv = 1;	rv = 1;
}	}
Line 276 framereset(UINT cnt)	Line 276 framereset(UINT cnt)
kdispwin_draw((BYTE)cnt);	kdispwin_draw((BYTE)cnt);
toolwin_draw((BYTE)cnt);	toolwin_draw((BYTE)cnt);
viewer_allreload(FALSE);	viewer_allreload(FALSE);
	debugwin_process();
if (np2oscfg.DISPCLK & 3) {	if (np2oscfg.DISPCLK & 3) {
if (sysmng_workclockrenewal()) {	if (sysmng_workclockrenewal()) {
sysmng_updatecaption(3);	sysmng_updatecaption(3);

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

Removed from v.1.11
changed lines
	Added in v.1.14