[Scummvm-cvs-logs] CVS: scummvm/bs2 save_rest.cpp,1.14,1.15

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv31685

Modified Files:
	save_rest.cpp 
Log Message:
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.)


Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/save_rest.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- save_rest.cpp	14 Sep 2003 21:45:42 -0000	1.14
+++ save_rest.cpp	20 Sep 2003 12:26:55 -0000	1.15
@@ -128,7 +128,6 @@
 	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 @@
 	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