aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v2.cpp
diff options
context:
space:
mode:
authorJamieson Christian2003-05-21 17:34:01 +0000
committerJamieson Christian2003-05-21 17:34:01 +0000
commitc24df81f782a4d9c5651df3e2fe4bd302e1e4d5b (patch)
treefed71aafc4be10505dd9f93586c43fdd3ee7b137 /scumm/script_v2.cpp
parentb4c94e4aee28fe46165bf3b153e85b78a487ef9b (diff)
downloadscummvm-rg350-c24df81f782a4d9c5651df3e2fe4bd302e1e4d5b.tar.gz
scummvm-rg350-c24df81f782a4d9c5651df3e2fe4bd302e1e4d5b.tar.bz2
scummvm-rg350-c24df81f782a4d9c5651df3e2fe4bd302e1e4d5b.zip
Fixed VC++ warning
svn-id: r7793
Diffstat (limited to 'scumm/script_v2.cpp')
-rw-r--r--scumm/script_v2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 614523c3b5..53c33af8d9 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -1161,7 +1161,7 @@ void Scumm_v2::o2_cutscene() {
warning("TODO o2_cutscene()");
vm.cutSceneData[0] = _userState;
- vm.cutSceneData[1] = VAR(VAR_CURSORSTATE);
+ vm.cutSceneData[1] = (int16) VAR(VAR_CURSORSTATE);
vm.cutSceneData[2] = _currentRoom;
vm.cutSceneData[3] = camera._mode;
@@ -1190,7 +1190,7 @@ void Scumm_v2::o2_endCutscene() {
// TODO: some cursor command stuff (probably to reset it to the pre-cutscene state)
if (_gameId == GID_MANIAC) {
- camera._mode = vm.cutSceneData[3];
+ camera._mode = (byte) vm.cutSceneData[3];
if (camera._mode == CM_FOLLOW_ACTOR) {
actorFollowCamera(VAR(VAR_EGO));
} else if (vm.cutSceneData[2] != _currentRoom) {