np2/macos9/np2.cpp - diff

Return to np2.cpp CVS log

Up to [RetroPC.NET] / np2 / macos9

Diff for /np2/macos9/np2.cpp between versions 1.1 and 1.5

version 1.1, 2003/10/23 07:20:43	version 1.5, 2003/10/23 19:31:58
Line 34	Line 34
#define USE_RESUME	#define USE_RESUME


#if defined(NP2GCC)	NP2OSCFG np2oscfg = {0, 2, 0, 0, 0, 0};
NP2OSCFG np2oscfg = {0, 2, 0, 0, 0, 0};
#else
NP2OSCFG np2oscfg = {0, 2, 0, 0, 0};
#endif

WindowPtr hWndMain;	WindowPtr hWndMain;
BOOL np2running;	BOOL np2running;
Line 143 static void HandleMenuChoice(long wParam	Line 139 static void HandleMenuChoice(long wParam
pccore_reset();	pccore_reset();
break;	break;

#if 0	case IDM_CONFIGURE:
case IDM_NEWFDD:	ConfigDialogProc();
newdisk();
break;	break;
#endif
#if 0	case IDM_NEWDISK:
case IDM_NEWHDD:	dialog_newdisk();
newhdddisk();
break;	break;
#endif
	case IDM_FONT:
	dialog_font();
	break;

case IDM_EXIT:	case IDM_EXIT:
np2running = FALSE;	np2running = FALSE;
break;	break;
Line 401 static void HandleMenuChoice(long wParam	Line 399 static void HandleMenuChoice(long wParam
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATECFG;
break;	break;

	case IDM_BMPSAVE:
	dialog_writebmp();
	break;

case IDM_DISPCLOCK:	case IDM_DISPCLOCK:
menu_setdispclk(np2oscfg.DISPCLK ^ 1);	menu_setdispclk(np2oscfg.DISPCLK ^ 1);
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATECFG;
Line 456 static void HandleMouseDown(EventRecord	Line 458 static void HandleMouseDown(EventRecord

switch(FindWindow(pevent->where, &hWnd)) {	switch(FindWindow(pevent->where, &hWnd)) {
case inMenuBar:	case inMenuBar:
	soundmng_stop();
HandleMenuChoice(MenuSelect(pevent->where));	HandleMenuChoice(MenuSelect(pevent->where));
break;	break;

Line 560 static void flagsave(const char *ext) {	Line 563 static void flagsave(const char *ext) {
statsave_save(path);	statsave_save(path);
}	}

static void flagload(const char *ext) {	static void flagdelete(const char *ext) {

char path[MAX_PATH];	char path[MAX_PATH];
char buf[1024];
	getstatfilename(path, ext, sizeof(path));
	file_delete(path);
	}

	static int flagload(const char *ext) {

int ret;	int ret;
	char path[MAX_PATH];
	char buf[1024];
	int r;

	ret = IDOK;
getstatfilename(path, ext, sizeof(path));	getstatfilename(path, ext, sizeof(path));
ret = statsave_check(path, buf, sizeof(buf));	r = statsave_check(path, buf, sizeof(buf));
if (ret == NP2FLAG_SUCCESS) {	if (r & (~NP2FLAG_DISKCHG)) {
	ResumeErrorDialogProc();
	ret = IDCANCEL;
	}
	else if (r & NP2FLAG_DISKCHG) {
	ret = ResumeWarningDialogProc(buf);
	}
	if (ret == IDOK) {
statsave_load(path);	statsave_load(path);
}	}
	return(ret);
}	}

int main(int argc, char *argv[]) {	int main(int argc, char *argv[]) {
Line 639 int main(int argc, char *argv[]) {	Line 660 int main(int argc, char *argv[]) {
scrndraw_redraw();	scrndraw_redraw();
pccore_reset();	pccore_reset();

#if defined(USE_RESUME)	if (np2oscfg.resume) {
flagload(np2resume);	flagload(np2resume);
#endif	}

SetEventMask(everyEvent);	SetEventMask(everyEvent);

Line 655 int main(int argc, char *argv[]) {	Line 676 int main(int argc, char *argv[]) {
#if defined(NP2GCC)	#if defined(NP2GCC)
mouse_callback();	mouse_callback();
#endif	#endif
	soundmng_play();
mackbd_callback();	mackbd_callback();
pccore_exec(framecnt == 0);	pccore_exec(framecnt == 0);
if (np2oscfg.DRAW_SKIP) { // nowait frame skip	if (np2oscfg.DRAW_SKIP) { // nowait frame skip
Line 675 int main(int argc, char *argv[]) {	Line 697 int main(int argc, char *argv[]) {
#if defined(NP2GCC)	#if defined(NP2GCC)
mouse_callback();	mouse_callback();
#endif	#endif
	soundmng_play();
mackbd_callback();	mackbd_callback();
pccore_exec(framecnt == 0);	pccore_exec(framecnt == 0);
framecnt++;	framecnt++;
Line 689 int main(int argc, char *argv[]) {	Line 712 int main(int argc, char *argv[]) {
#if defined(NP2GCC)	#if defined(NP2GCC)
mouse_callback();	mouse_callback();
#endif	#endif
	soundmng_play();
mackbd_callback();	mackbd_callback();
pccore_exec(framecnt == 0);	pccore_exec(framecnt == 0);
framecnt++;	framecnt++;
// �ƥ��
cnt = timing_getcount();	cnt = timing_getcount();
if (framecnt > cnt) {	if (framecnt > cnt) {
waitcnt = framecnt;	waitcnt = framecnt;
Line 705 int main(int argc, char *argv[]) {	Line 728 int main(int argc, char *argv[]) {
framemax++;	framemax++;
}	}
if (cnt >= 12) {	if (cnt >= 12) {
timing_init();	timing_reset();
}	}
else {	else {
timing_setcount(cnt - framecnt);	timing_setcount(cnt - framecnt);
Line 724 int main(int argc, char *argv[]) {	Line 747 int main(int argc, char *argv[]) {

pccore_cfgupdate();	pccore_cfgupdate();

#if defined(USE_RESUME)	if (np2oscfg.resume) {
flagsave(np2resume);	flagsave(np2resume);
#endif	}
	else {
	flagdelete(np2resume);
	}

pccore_term();	pccore_term();
S98_trash();	S98_trash();

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

Removed from v.1.1
changed lines
	Added in v.1.5