diff options
| author | Oliver Kiehl | 2003-04-25 21:41:50 +0000 |
|---|---|---|
| committer | Oliver Kiehl | 2003-04-25 21:41:50 +0000 |
| commit | bb32c69238a1d442d3665b7b5769b4c081035259 (patch) | |
| tree | 45cad1c39aafcc7c027ee2812755db5d25e9028d | |
| parent | 5c93732d6030efbb8f0d9bbf738b87f28dfc1d36 (diff) | |
| download | scummvm-rg350-bb32c69238a1d442d3665b7b5769b4c081035259.tar.gz scummvm-rg350-bb32c69238a1d442d3665b7b5769b4c081035259.tar.bz2 scummvm-rg350-bb32c69238a1d442d3665b7b5769b4c081035259.zip | |
some endian fixes
svn-id: r7120
| -rw-r--r-- | sky/logic.cpp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/sky/logic.cpp b/sky/logic.cpp index f72b03b767..73d3311077 100644 --- a/sky/logic.cpp +++ b/sky/logic.cpp @@ -98,18 +98,20 @@ void SkyLogic::logicScript() { for (;;) { uint16 mode = _compact->mode; // get pointer to current script printf("compact mode: %d\n", mode); - // FIXME: not endian safe - uint32 *p = (uint32 *)SkyCompact::getCompactElem(_compact, C_BASE_SUB + mode); - uint32 scr = *p; // get script number and offset + uint16 *p1= (uint16 *)SkyCompact::getCompactElem(_compact, C_BASE_SUB + mode); + uint16 *p2= (uint16 *)SkyCompact::getCompactElem(_compact, C_BASE_SUB + mode + 2); + uint32 scr = (*p2 << 16) | *p1; // get script number and offset // FIXME: HACK ALERT!!!! if (scr == 0x27) scr = 0x9fa0027; printf("script: 0x%X\n", scr); - *p = script(_compact, scr); + scr = script(_compact, scr); + *p1 = (uint16)(scr & 0xffff); + *p2 = (uint16)(scr >> 16); - if (!(*p & 0xffff0000)) // script finished + if (!(scr & 0xffff0000)) // script finished _compact->mode -= 4; else if (_compact->mode == mode) return; @@ -157,9 +159,11 @@ void SkyLogic::alt() { // change the current script _compact->logic = L_SCRIPT; - // FIXME: not endian safe - uint32 *p = (uint32 *)SkyCompact::getCompactElem(_compact, C_BASE_SUB + _compact->mode); - *p = _compact->extCompact->alt; + uint16 *p1= (uint16 *)SkyCompact::getCompactElem(_compact, C_BASE_SUB + _compact->mode); + uint16 *p2= (uint16 *)SkyCompact::getCompactElem(_compact, C_BASE_SUB + _compact->mode + 2); + + *p1 = _compact->extCompact->alt; + *p2 = 0; logicScript(); } @@ -686,9 +690,10 @@ uint32 SkyLogic::fnGetTo(uint32 targetPlaceId, uint32 mode, uint32 c) { while (*getToTable != targetPlaceId) getToTable += 2; - // FIXME: not endian safe - uint32 *p = (uint32 *)SkyCompact::getCompactElem(_compact, C_BASE_SUB + _compact->mode); - *p = *(getToTable + 1); // get new script + uint16 *p1= (uint16 *)SkyCompact::getCompactElem(_compact, C_BASE_SUB + _compact->mode); + uint16 *p2= (uint16 *)SkyCompact::getCompactElem(_compact, C_BASE_SUB + _compact->mode + 2); + *p1 = *(getToTable + 1); // get new script + *p2 = 0; return 0; // drop out of script } |