aboutsummaryrefslogtreecommitdiff
path: root/sword2/walker.cpp
diff options
context:
space:
mode:
authorJonathan Gray2003-07-28 11:21:25 +0000
committerJonathan Gray2003-07-28 11:21:25 +0000
commitc1cbd4605e6a3ae3a28462cdb30482454e1b6da0 (patch)
tree4644905a3160d0c5c34c025f0e12e60eb7f195ef /sword2/walker.cpp
parent9e051fa5070cd70ff0e69faa647ad26f66b64560 (diff)
downloadscummvm-rg350-c1cbd4605e6a3ae3a28462cdb30482454e1b6da0.tar.gz
scummvm-rg350-c1cbd4605e6a3ae3a28462cdb30482454e1b6da0.tar.bz2
scummvm-rg350-c1cbd4605e6a3ae3a28462cdb30482454e1b6da0.zip
fix some VC7 warnings
svn-id: r9240
Diffstat (limited to 'sword2/walker.cpp')
-rw-r--r--sword2/walker.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/sword2/walker.cpp b/sword2/walker.cpp
index 93033e4862..6430152acd 100644
--- a/sword2/walker.cpp
+++ b/sword2/walker.cpp
@@ -121,9 +121,9 @@ int32 FN_walk(int32 *params) // James (14nov96)
ob_graph = (Object_graphic *)params[1];
ob_mega = (Object_mega *)params[2];
- target_x = params[4];
- target_y = params[5];
- target_dir = params[6];
+ target_x = (int16) params[4];
+ target_y = (int16) params[5];
+ target_dir = (uint8) params[6];
//----------------------------------------------------------------------------------------
// if this is the start of the walk, calculate route
@@ -154,7 +154,7 @@ int32 FN_walk(int32 *params) // James (14nov96)
ob_mega->walk_pc=0; //always
AllocateRouteMem(); // set up mem for _walkData in route_slots[] & set mega's 'route_slot_id' accordingly
- route = RouteFinder(ob_mega, ob_walkdata, target_x, target_y, target_dir);
+ route = (int8) RouteFinder(ob_mega, ob_walkdata, target_x, target_y, target_dir);
/*
if (id == PLAYER)
@@ -923,9 +923,9 @@ int32 FN_set_standby_coords(int32 *params) // (10dec97 JEL)
//----------------------------------------------------------------------------------------
- standby_x = params[0];
- standby_y = params[1];
- standby_dir = params[2];
+ standby_x = (int16) params[0];
+ standby_y = (int16) params[1];
+ standby_dir = (uint8) params[2];
return(IR_CONT); // continue script
}