aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2007-07-29 17:10:51 +0000
committerFilippos Karapetis2007-07-29 17:10:51 +0000
commite5808ea2f28a51bdf4317b1498aa58ef14f7df53 (patch)
treeac4172bae5010c46a0407e0ddcc6c4af2748f49e /engines
parentae461cebd6d7ae7b3d4272da30529dc035b196ff (diff)
downloadscummvm-rg350-e5808ea2f28a51bdf4317b1498aa58ef14f7df53.tar.gz
scummvm-rg350-e5808ea2f28a51bdf4317b1498aa58ef14f7df53.tar.bz2
scummvm-rg350-e5808ea2f28a51bdf4317b1498aa58ef14f7df53.zip
Fixed some warnings
svn-id: r28304
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/kyra_v2.cpp2
-rw-r--r--engines/kyra/screen_v2.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp
index 3e08ea43c6..e27f31b691 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -901,7 +901,7 @@ int KyraEngine_v2::inputSceneChange(int x, int y, int unk1, int unk2) {
_timer->disable(5);
if (wayLength != 0 && wayLength != 0x7D00)
- refreshNPC = trySceneChange(_movFacingTable, unk1, unk2);
+ refreshNPC = (trySceneChange(_movFacingTable, unk1, unk2) != 0);
//XXX
diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/screen_v2.cpp
index 3ad69818c6..83c75585a8 100644
--- a/engines/kyra/screen_v2.cpp
+++ b/engines/kyra/screen_v2.cpp
@@ -417,7 +417,7 @@ void Screen_v2::drawShape(uint8 page, const uint8 *shape, int x, int y, int sd,
uint16 sx1 = getScreenDim(sd)->sx << 3;
uint16 sy1 = getScreenDim(sd)->sy;
- uint16 sx2 = sx1 + getScreenDim(sd)->w << 3;
+ uint16 sx2 = sx1 + (getScreenDim(sd)->w << 3);
uint16 sy2 = sy1 + getScreenDim(sd)->h;
if (flags & 0x10) {
x += sx1;