[Scummvm-cvs-logs] CVS: scummvm/sky intro.cpp,1.12,1.13
Oliver Kiehl
olki at users.sourceforge.net
Mon Apr 28 13:51:08 CEST 2003
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv32658
Modified Files:
intro.cpp
Log Message:
endian fixes
Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- intro.cpp 28 Apr 2003 18:19:48 -0000 1.12
+++ intro.cpp 28 Apr 2003 20:50:18 -0000 1.13
@@ -442,19 +442,19 @@
//check for sequence commands
assert (cmdPtr != NULL);
- uint32 afterFrame = READ_LE_UINT32(cmdPtr);
+ uint32 afterFrame = *(cmdPtr);
if (afterFrame >= _tseqFrames) {
//do a command
- uint32 command = READ_LE_UINT32(cmdPtr + 1);
+ uint32 command = *(cmdPtr + 1);
(this->*commandRoutines[command])(cmdPtr);
}
}
void SkyState::prepareText(uint32 *&cmdPtr) {
- uint32 textNum = READ_LE_UINT32(cmdPtr + 2);
+ uint32 textNum = *(cmdPtr + 2);
_skyText->getText(textNum, _language);
_skyText->displayText(_introTextSpace, true, INTRO_TEXT_WIDTH, 255);
cmdPtr += 3;
@@ -462,13 +462,13 @@
void SkyState::showIntroText(uint32 *&cmdPtr) {
- uint32 xPos = READ_LE_UINT32(cmdPtr + 2);
- uint32 yPos = READ_LE_UINT32(cmdPtr + 3);
+ uint32 xPos = *(cmdPtr + 2);
+ uint32 yPos = *(cmdPtr + 3);
uint32 startPos = (yPos * FULL_SCREEN_WIDTH) + xPos;
byte *destBuf = _introTextSpace;
byte *saveBuf = _introTextSave;
- uint32 width = FROM_LE_32(((struct dataFileHeader *)destBuf)->s_width);
- uint32 height = FROM_LE_32(((struct dataFileHeader *)destBuf)->s_height);
+ uint16 width = FROM_LE_16(((struct dataFileHeader *)destBuf)->s_width);
+ uint16 height = FROM_LE_16(((struct dataFileHeader *)destBuf)->s_height);
*(uint32 *)saveBuf = TO_LE_32(startPos);
*(uint32 *)(saveBuf + 4) = TO_LE_32(height);
More information about the Scummvm-git-logs
mailing list