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

win32: fixed an input display related merging mistake

This commit is contained in:
p989 2009-04-11 01:08:03 +00:00
parent 5382dab908
commit ed3393987f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2211,8 +2211,6 @@ void input_process()
NDS_setPad( R, L, D, U, T, S, B, A, Y, X, W, E, G, F); NDS_setPad( R, L, D, U, T, S, B, A, Y, X, W, E, G, F);
if (ShowInputDisplay) osd->addFixed(0, 45, "%s",InputDisplayString.c_str());
} }
static void set_hotkeyinfo(HWND hDlg) static void set_hotkeyinfo(HWND hDlg)

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

@ -997,6 +997,8 @@ DWORD WINAPI run()
{ {
input_process(); input_process();
if (ShowInputDisplay) osd->addFixed(Hud.InputDisplay.x, Hud.InputDisplay.y, "%s",InputDisplayString.c_str());
{ {
Lock lock; Lock lock;
cycles = NDS_exec((560190<<1)-cycles); cycles = NDS_exec((560190<<1)-cycles);
@ -1128,7 +1130,6 @@ DWORD WINAPI run()
} }
frameCounter++; frameCounter++;
if (frameCounterDisplay) osd->addFixed(Hud.FrameCounter.x, Hud.FrameCounter.y, "%d",frameCounter); if (frameCounterDisplay) osd->addFixed(Hud.FrameCounter.x, Hud.FrameCounter.y, "%d",frameCounter);
if (ShowInputDisplay) osd->addFixed(Hud.InputDisplay.x, Hud.InputDisplay.y, "%s",InputDisplayString.c_str());
if (ShowLagFrameCounter) osd->addFixed(Hud.LagFrameCounter.x, Hud.LagFrameCounter.y, "%d",TotalLagFrames); if (ShowLagFrameCounter) osd->addFixed(Hud.LagFrameCounter.x, Hud.LagFrameCounter.y, "%d",TotalLagFrames);
if (ShowMicrophone) osd->addFixed(Hud.Microphone.x, Hud.Microphone.y, "%d",MicDisplay); if (ShowMicrophone) osd->addFixed(Hud.Microphone.x, Hud.Microphone.y, "%d",MicDisplay);
DisplayMessage(); DisplayMessage();