diff options
| author | Paul Gilbert | 2009-07-06 02:46:59 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2009-07-06 02:46:59 +0000 |
| commit | 08df8dc2721808c7019f49d9051e2eebfe8dad9c (patch) | |
| tree | 47a30bb4f5acdd2f58e255ee0eea587e4e8e0dd4 /engines | |
| parent | c3d9acf309c8616bdf99ebfc8236a984a08de323 (diff) | |
| download | scummvm-rg350-08df8dc2721808c7019f49d9051e2eebfe8dad9c.tar.gz scummvm-rg350-08df8dc2721808c7019f49d9051e2eebfe8dad9c.tar.bz2 scummvm-rg350-08df8dc2721808c7019f49d9051e2eebfe8dad9c.zip | |
Bugfix for node enabling/disabling, which was previously allowing the player to walk through closed doors and into the walls
svn-id: r42162
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/cruise/ctp.cpp | 4 | ||||
| -rw-r--r-- | engines/cruise/function.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/cruise/ctp.cpp b/engines/cruise/ctp.cpp index be4639af4d..11d5f582ed 100644 --- a/engines/cruise/ctp.cpp +++ b/engines/cruise/ctp.cpp @@ -209,9 +209,9 @@ int setNodeState(int nodeIdx, int nodeState) { int oldState = walkboxState[nodeIdx]; if (nodeState == -1) - return + return oldState; - walkboxState[nodeIdx] = nodeState; + walkboxState[nodeIdx] = nodeState; return oldState; } diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp index eab69c6846..d0443ef458 100644 --- a/engines/cruise/function.cpp +++ b/engines/cruise/function.cpp @@ -828,7 +828,7 @@ int16 Op_Preload(void) { } int16 Op_LoadCt(void) { - return initCt((char*)popPtr()); + return initCt((const char *)popPtr()); } int16 Op_EndAnim(void) { |