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

win32: cleanup and fix bug where input is ignored during frameadvance

This commit is contained in:
zeromus 2009-02-11 05:21:40 +00:00
parent b3d0485587
commit ce7cb192ed
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2176,7 +2176,8 @@ void input_process()
{ {
S9xWinScanJoypads(); S9xWinScanJoypads();
if (paused) return; //not appropriate right now in desmume
//if (paused) return;
bool R = joypads[0] & RIGHT_MASK; bool R = joypads[0] & RIGHT_MASK;
bool L = joypads[0] & LEFT_MASK; bool L = joypads[0] & LEFT_MASK;

1
desmume/src/windows/inputdx.h
View File

@ -110,6 +110,7 @@ extern SJoypad TurboToggleJoypadStorage[8];
void RunInputConfig(); void RunInputConfig();
void RunHotkeyConfig(); void RunHotkeyConfig();
void input_process();
#endif #endif

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

@ -802,6 +802,8 @@ DWORD WINAPI run()
{ {
while(execute) while(execute)
{ {
input_process();
{ {
Lock lock; Lock lock;
cycles = NDS_exec((560190<<1)-cycles); cycles = NDS_exec((560190<<1)-cycles);
@ -821,10 +823,7 @@ DWORD WINAPI run()
// if (!skipnextframe) // if (!skipnextframe)
// { // {
//input->process();
//TODO INPUT
void input_process();
input_process();
if (FpsDisplay) osd->addFixed(0, 5, "%02d Fps", fps); if (FpsDisplay) osd->addFixed(0, 5, "%02d Fps", fps);
osd->update(); osd->update();