aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamieson Christian2003-05-18 23:45:34 +0000
committerJamieson Christian2003-05-18 23:45:34 +0000
commitac9a392a5beed682d0d6f6d975ee2076f58671f8 (patch)
tree000cdfc9ec35fee7d8c11b516012ee33bb814f27
parent1f616edfcde33d43c5b8fd7edfbd54dae60fcead (diff)
downloadscummvm-rg350-ac9a392a5beed682d0d6f6d975ee2076f58671f8.tar.gz
scummvm-rg350-ac9a392a5beed682d0d6f6d975ee2076f58671f8.tar.bz2
scummvm-rg350-ac9a392a5beed682d0d6f6d975ee2076f58671f8.zip
Fixed VC++ warnings
svn-id: r7652
-rw-r--r--scumm/debugger.cpp2
-rw-r--r--scumm/gfx.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp
index 79707efdb7..dfb0df2f8c 100644
--- a/scumm/debugger.cpp
+++ b/scumm/debugger.cpp
@@ -555,7 +555,7 @@ bool ScummDebugger::Cmd_Actor(int argc, const char **argv) {
a = &_s->_actors[actnum];
if (!strcmp(argv[2], "ignoreboxes")) {
- a->ignoreBoxes = atoi(argv[3]);
+ a->ignoreBoxes = (atoi(argv[3]) > 0);
Debug_Printf("Actor[%d].ignoreBoxes = %d\n", actnum, a->ignoreBoxes);
} else if (!strcmp(argv[2], "costume")) {
value = atoi(argv[3]);
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index afe0983ac6..2eb037ea5a 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -3106,7 +3106,7 @@ void Scumm::createSpecialPalette(int16 from, int16 to, int16 redScale, int16 gre
searchPtr = palPtr + from * 3;
bestResult = 32000;
- currentIndex = from;
+ currentIndex = (byte) from;
for (j = from; j < to; j++) {
int ar = (*searchPtr++);