ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change lag counter to be cumulative instead of instantaneous. also fix some file line endings

This commit is contained in:
zeromus 2009-04-02 22:48:32 +00:00
parent e1f77790cc
commit 430a6064b7
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/FIFO.cpp
View File

@ -265,4 +265,4 @@ u32 DISP_FIFOrecv()
if (disp_fifo.head > 0x5FFF)
disp_fifo.head = 0;
return (val);
}
}

13
desmume/src/NDSSystem.cpp
View File

@ -64,9 +64,10 @@ BOOL fw_success = FALSE;
NDSSystem nds;
int lagframecounter=0;
int LagFrameFlag=0;
int lastLag=0;
int lagframecounter;
int LagFrameFlag;
int lastLag;
int TotalLagFrames;
/* ------------------------------------------------------------------------- */
/* FIRMWARE DECRYPTION */
@ -862,6 +863,11 @@ void NDS_Reset( void)
if (!header) return ;
lagframecounter=0;
LagFrameFlag=0;
lastLag=0;
TotalLagFrames=0;
MMU_clearMem();
//ARM7 BIOS IRQ HANDLER
@ -2218,6 +2224,7 @@ u32 NDS_exec(s32 nb)
if(LagFrameFlag)
{
lagframecounter++;
TotalLagFrames++;
}
else
{

2
desmume/src/NDSSystem.h
View File

@ -332,7 +332,7 @@ extern Driver* driver;
extern std::string InputDisplayString;
extern int LagFrameFlag;
extern int lastLag;
extern int lastLag, TotalLagFrames;
#endif

2
desmume/src/rtc.h
View File

@ -30,4 +30,4 @@
extern void rtcInit();
extern u16 rtcRead();
extern void rtcWrite(u16 val);
#endif
#endif

2
desmume/src/windows/main.cpp
View File

@ -1015,7 +1015,7 @@ DWORD WINAPI run()
frameCounter++;
if (frameCounterDisplay) osd->addFixed(0, 25, "%d",frameCounter);
if (ShowInputDisplay) osd->addFixed(0, 45, "%s",InputDisplayString.c_str());
if (ShowLagFrameCounter) osd->addFixed(0, 65, "%d",lastLag);
if (ShowLagFrameCounter) osd->addFixed(0, 65, "%d",TotalLagFrames);
DisplayMessage();
CheckMessages();
}