libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 09:18:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Got rid of g_EngineState

Browse Source 
svn-id: r41359
This commit is contained in:
Max Horn 2009-06-07 23:04:34 +00:00
parent 77bcc94f80
commit 0dcb1fa84f
3 changed files with 190 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

380
engines/sci/console.cpp
View File

File diff suppressed because it is too large Load Diff

4
engines/sci/engine/vm.cpp
View File

@ -1945,12 +1945,9 @@ static void _init_stack_base_with_selector(EngineState *s, Selector selector) {
s->stack_base[1] = NULL_REG; s->stack_base[1] = NULL_REG;
} }
EngineState *g_EngineState = 0;
static EngineState *_game_run(EngineState *&s, int restoring) { static EngineState *_game_run(EngineState *&s, int restoring) {
EngineState *successor = NULL; EngineState *successor = NULL;
int game_is_finished = 0; int game_is_finished = 0;
g_EngineState = s;
do { do {
s->_executionStackPosChanged = false; s->_executionStackPosChanged = false;
run_vm(s, (successor || restoring) ? 1 : 0); run_vm(s, (successor || restoring) ? 1 : 0);
@ -1978,7 +1975,6 @@ static EngineState *_game_run(EngineState *&s, int restoring) {
script_free_vm_memory(s); script_free_vm_memory(s);
delete s; delete s;
s = successor; s = successor;
g_EngineState = s;
if (script_abort_flag == 2) { if (script_abort_flag == 2) {
sciprintf("Restarting with replay()\n"); sciprintf("Restarting with replay()\n");

1
engines/sci/sci.h
View File

@ -133,6 +133,7 @@ enum SciGameFlags {
}; };
class SciEngine : public Engine { class SciEngine : public Engine {
friend class Console;
public: public:
SciEngine(OSystem *syst, const SciGameDescription *desc); SciEngine(OSystem *syst, const SciGameDescription *desc);
~SciEngine(); ~SciEngine();