[Scummvm-cvs-logs] CVS: scummvm/bs2 walker.cpp,1.4,1.5 walker.h,1.1,1.2
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Sat Sep 20 05:44:03 CEST 2003
Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv1842
Modified Files:
walker.cpp walker.h
Log Message:
cleanup
Index: walker.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/walker.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- walker.cpp 28 Jul 2003 11:21:25 -0000 1.4
+++ walker.cpp 20 Sep 2003 12:43:11 -0000 1.5
@@ -17,388 +17,331 @@
* $Header$
*/
-//--------------------------------------------------------------------------------------
// WALKER.CPP by James (14nov96)
-// script functions for moving megas about the place & also for keeping tabs on them
+// script functions for moving megas about the place & also for keeping tabs
+// on them
-// FN_walk() // walk to (x,y,dir)
[...1346 lines suppressed...]
- Con_fatal_error("Invalid direction (%d) in FN_set_standby_coords (%s line %u)",params[2],__FILE__,__LINE__);
+ // params: 0 x-coord
+ // 1 y-coord
+ // 2 direction (0..7)
- //----------------------------------------------------------------------------------------
+ if (params[2] < 0 || params[2] > 7)
+ Con_fatal_error("Invalid direction (%d) in FN_set_standby_coords (%s line %u)", params[2], __FILE__, __LINE__);
- standby_x = (int16) params[0];
- standby_y = (int16) params[1];
- standby_dir = (uint8) params[2];
+ standby_x = (int16) params[0];
+ standby_y = (int16) params[1];
+ standby_dir = (uint8) params[2];
- return(IR_CONT); // continue script
+ return IR_CONT;
}
-//---------------------------------------------------------------------------------------------------------------------
Index: walker.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/walker.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- walker.h 28 Jul 2003 01:44:38 -0000 1.1
+++ walker.h 20 Sep 2003 12:43:11 -0000 1.2
@@ -20,15 +20,11 @@
#ifndef _WALKER
#define _WALKER
-//#include "src\driver96.h"
-
-
-
int32 FN_face_mega(int32 *params);
int32 FN_turn(int32 *params);
-int32 FN_walk(int32 *params); // James (14nov96)
-int32 FN_walk_to_anim(int32 *params); // James (14nov96)
-int32 FN_stand_after_anim(int32 *params); // James (18jun97)
-int32 FN_stand(int32 *params); // James
+int32 FN_walk(int32 *params);
+int32 FN_walk_to_anim(int32 *params);
+int32 FN_stand_after_anim(int32 *params);
+int32 FN_stand(int32 *params);
#endif
More information about the Scummvm-git-logs
mailing list