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

Lua - ip out all the code related to pausing/unpausing of the emulator when running/stopping lua scripts. Let the user be in control of that.

This commit is contained in:
adelikat 2010-04-07 21:45:06 +00:00
parent bb51d75e22
commit b7b4629019
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -1,3 +1,4 @@
07-april-2010 - adelikat - Lua console no longer unpauses the emulator when a script is loaded
30-march-2010 - ugetab - Win32 - Closing minimized windows no longer moves them the next time they get opened 30-march-2010 - ugetab - Win32 - Closing minimized windows no longer moves them the next time they get opened
28-march-2010 - adelikat - lua - fixed zapper.read() to read movie data if a movie is playing. Also changed the struct values to x,y,fire. This breaks lua scripts that used it previous, sorry. 28-march-2010 - adelikat - lua - fixed zapper.read() to read movie data if a movie is playing. Also changed the struct values to x,y,fire. This breaks lua scripts that used it previous, sorry.
04-march-2010 - prockguy - added menu buttons for loading nsf files 04-march-2010 - prockguy - added menu buttons for loading nsf files

8
src/lua-engine.cpp
View File

@ -211,8 +211,8 @@ static void FCEU_LuaOnStop() {
luajoypads2[i]= 0x00; luajoypads2[i]= 0x00;
} }
gui_used = GUI_CLEAR; gui_used = GUI_CLEAR;
if (wasPaused && !FCEUI_EmulationPaused()) //if (wasPaused && !FCEUI_EmulationPaused())
FCEUI_ToggleEmulationPause(); // FCEUI_ToggleEmulationPause();
FCEUD_SetEmulationSpeed(EMUSPEED_NORMAL); //TODO: Ideally lua returns the speed to the speed the user set before running the script FCEUD_SetEmulationSpeed(EMUSPEED_NORMAL); //TODO: Ideally lua returns the speed to the speed the user set before running the script
//rather than returning it to normal, and turbo off. Perhaps some flags and a FCEUD_GetEmulationSpeed function //rather than returning it to normal, and turbo off. Perhaps some flags and a FCEUD_GetEmulationSpeed function
FCEUD_TurboOff(); //Turn off turbo FCEUD_TurboOff(); //Turn off turbo
@ -4647,8 +4647,8 @@ int FCEU_LoadLuaCode(const char *filename, const char *arg) {
numMemHooks = 0; numMemHooks = 0;
transparencyModifier = 255; // opaque transparencyModifier = 255; // opaque
wasPaused = FCEUI_EmulationPaused(); //wasPaused = FCEUI_EmulationPaused();
if (wasPaused) FCEUI_ToggleEmulationPause(); //if (wasPaused) FCEUI_ToggleEmulationPause();
// And run it right now. :) // And run it right now. :)
//FCEU_LuaFrameBoundary(); //FCEU_LuaFrameBoundary();