aboutsummaryrefslogtreecommitdiff
path: root/sky
diff options
context:
space:
mode:
authorPaweł Kołodziejski2003-04-25 17:39:43 +0000
committerPaweł Kołodziejski2003-04-25 17:39:43 +0000
commit733fb795ec88ae2b91750dc1db40ad4fcda089e9 (patch)
treee12fd6ced652b37f0b95b3be5448a91050a57d31 /sky
parent9e1e4413d48d28c8f9dad4684b7c771dd8159666 (diff)
downloadscummvm-rg350-733fb795ec88ae2b91750dc1db40ad4fcda089e9.tar.gz
scummvm-rg350-733fb795ec88ae2b91750dc1db40ad4fcda089e9.tar.bz2
scummvm-rg350-733fb795ec88ae2b91750dc1db40ad4fcda089e9.zip
fixed few warnings
svn-id: r7112
Diffstat (limited to 'sky')
-rw-r--r--sky/logic.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/sky/logic.cpp b/sky/logic.cpp
index e118d3ea41..4224fd54bc 100644
--- a/sky/logic.cpp
+++ b/sky/logic.cpp
@@ -229,7 +229,7 @@ static byte _stackPtr = 0;
void SkyLogic::checkModuleLoaded(uint32 moduleNo) {
if (!_moduleList[moduleNo])
- _moduleList[moduleNo] = (uint16 *)_skyDisk->loadFile(moduleNo + f_module_0, NULL);
+ _moduleList[moduleNo] = (uint16 *)_skyDisk->loadFile((uint8)moduleNo + f_module_0, NULL);
}
void SkyLogic::push(uint32 a) {
@@ -407,8 +407,8 @@ script:
// Bit 12-15 - Module number
// Bit 16-31 - Script offset (if any)
- uint16 scriptNo = scr & 0xffff;
- uint16 moduleNo = (scr & 0xff00) >> 12;
+ uint16 scriptNo = (uint8)(scr & 0xffff);
+ uint16 moduleNo = (uint8)((scr & 0xff00) >> 12);
printf("scriptNo: %d, moduleNo: %d\n", scriptNo, moduleNo);
uint16 *scriptData = _moduleList[moduleNo]; // get module address
@@ -562,7 +562,7 @@ script:
// pop a value into a compact
s = *scriptData++;
tmp = (uint16 *)SkyCompact::getCompactElem(compact, s);
- *tmp = pop();
+ *tmp = (uint8)pop();
break;
case 17: // is_equal
a = pop();
@@ -606,8 +606,8 @@ uint32 SkyLogic::fnDrawScreen(uint32 a, uint32 b, uint32 c) {
uint32 SkyLogic::fnAr(uint32 x, uint32 y, uint32 c) {
_compact->downFlag = 1; // assume failure in-case logic is interupted by speech (esp Joey)
- _compact->extCompact->arTargetX = x;
- _compact->extCompact->arTargetY = y;
+ _compact->extCompact->arTargetX = (uint8)x;
+ _compact->extCompact->arTargetY = (uint8)y;
_compact->logic = L_AR; // Set to AR mode
_compact->xcood &= 0xfff8;
@@ -680,7 +680,7 @@ uint32 SkyLogic::fnCloseHand(uint32 a, uint32 b, uint32 c) {
}
uint32 SkyLogic::fnGetTo(uint32 targetPlaceId, uint32 mode, uint32 c) {
- _compact->upFlag = mode; // save mode for action script
+ _compact->upFlag = (uint8)mode; // save mode for action script
_compact->mode += 4; // next level up
Compact *compact2 = SkyState::fetchCompact(_compact->place);
uint16 *getToTable = compact2->getToTable;