aboutsummaryrefslogtreecommitdiff
path: root/sword2/save_rest.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-09-20 12:26:55 +0000
committerTorbjörn Andersson2003-09-20 12:26:55 +0000
commit058273ed7ca93596bca90778a68bb3aa681a6c56 (patch)
tree5da0e7bd6d25e259109ac650602a2497a1a6f576 /sword2/save_rest.cpp
parent42905672995c1f50e10e2582dc79679bff5ef392 (diff)
downloadscummvm-rg350-058273ed7ca93596bca90778a68bb3aa681a6c56.tar.gz
scummvm-rg350-058273ed7ca93596bca90778a68bb3aa681a6c56.tar.bz2
scummvm-rg350-058273ed7ca93596bca90778a68bb3aa681a6c56.zip
The 'colliding' flag is never set to anything else than zero, so it should
be safe to remove it. (I'll remove it completely soon, but I'll start here to avoid compilation errors.) svn-id: r10331
Diffstat (limited to 'sword2/save_rest.cpp')
-rw-r--r--sword2/save_rest.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/sword2/save_rest.cpp b/sword2/save_rest.cpp
index ace08bb79e..1b7ccd65df 100644
--- a/sword2/save_rest.cpp
+++ b/sword2/save_rest.cpp
@@ -128,7 +128,6 @@ static void convertHeaderEndian(_savegameHeader &header) {
SWAP32(header.mega.feet_x);
SWAP32(header.mega.feet_y);
SWAP32(header.mega.current_dir);
- SWAP32(header.mega.colliding);
SWAP32(header.mega.megaset_res);
}
#endif
@@ -599,7 +598,6 @@ int32 FN_get_player_savedata(int32 *params) // James27feb97
if (ob_mega->currently_walking) // if the player was walking when game was saved
{
ob_mega->currently_walking = 0; // clear the flag
- ob_mega->colliding = 0; // reset this just in case
pars[0] = (int32)ob_graphic; // pointer to object's graphic structure
pars[1] = (int32)ob_mega; // pointer to object's mega structure