--- np2/macos9/sysmng.cpp 2003/10/23 07:20:43 1.1 +++ np2/macos9/sysmng.cpp 2004/05/21 15:02:31 1.3 @@ -1,8 +1,8 @@ #include "compiler.h" #include "np2.h" #include "dosio.h" -#include "i286.h" #include "sysmng.h" +#include "cpucore.h" #include "pccore.h" #include "fddfile.h" @@ -24,7 +24,7 @@ static struct { void sysmng_workclockreset(void) { workclock.tick = GETTICK(); - workclock.clock = I286_CLOCK; + workclock.clock = CPU_CLOCK; workclock.draws = drawcount; } @@ -39,8 +39,8 @@ BOOL sysmng_workclockrenewal(void) { workclock.tick += tick; workclock.fps = ((drawcount - workclock.draws) * 10000) / tick; workclock.draws = drawcount; - workclock.khz = (I286_CLOCK - workclock.clock) / tick; - workclock.clock = I286_CLOCK; + workclock.khz = (CPU_CLOCK - workclock.clock) / tick; + workclock.clock = CPU_CLOCK; return(TRUE); } @@ -82,7 +82,11 @@ void sysmng_updatecaption(BYTE flag) { milstr_ncat(strclock, work, sizeof(strclock)); } } +#if !defined(SUPPORT_PC9821) milstr_ncpy(work, "Neko Project II", sizeof(work)); +#else + milstr_ncpy(work, "Neko Project 21", sizeof(work)); +#endif milstr_ncat(work, strtitle, sizeof(work)); milstr_ncat(work, strclock, sizeof(work));