diff options
| author | Torbjörn Andersson | 2003-11-16 14:18:29 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-11-16 14:18:29 +0000 |
| commit | fa2b8ba8de31f5659c675b507553a2b0a1ebd841 (patch) | |
| tree | 52841e821b3283a0ff9430cf8be0cc273208f6e6 /sword2/events.cpp | |
| parent | ab066c41e0a42320137bc6cb79d77720f932af0e (diff) | |
| download | scummvm-rg350-fa2b8ba8de31f5659c675b507553a2b0a1ebd841.tar.gz scummvm-rg350-fa2b8ba8de31f5659c675b507553a2b0a1ebd841.tar.bz2 scummvm-rg350-fa2b8ba8de31f5659c675b507553a2b0a1ebd841.zip | |
More cleanup. I've eliminated all the temporary global variables I've added
over the past few weeks, except for g_sword2. (Of course, this doesn't
necessarily make the code any prettier, but we can work on that later.)
svn-id: r11309
Diffstat (limited to 'sword2/events.cpp')
| -rw-r--r-- | sword2/events.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sword2/events.cpp b/sword2/events.cpp index 8da448fdb4..621a8be2d5 100644 --- a/sword2/events.cpp +++ b/sword2/events.cpp @@ -17,14 +17,10 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sword2/sword2.h" -#include "sword2/console.h" -#include "sword2/debug.h" #include "sword2/defs.h" #include "sword2/interpreter.h" -#include "sword2/logic.h" -#include "sword2/object.h" namespace Sword2 { @@ -185,7 +181,7 @@ int32 Logic::fnPauseForEvent(int32 *params) { // params: 0 pointer to object's logic structure // 1 number of game-cycles to pause - Object_logic *ob_logic = (Object_logic *) memory->intToPtr(params[0]); + Object_logic *ob_logic = (Object_logic *) _vm->_memory->intToPtr(params[0]); // first, check for an event |