thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

work around a GCC bug.

Browse source 
svn-id: r11843
This commit is contained in:
Robert Göffringmann 2003-12-22 00:34:02 +00:00
parent bb38b7f75f
commit 6b0fb6585c
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sword1/screen.cpp
View file

@ -440,6 +440,7 @@ void SwordScreen::blitBlockClear(uint16 x, uint16 y, uint8 *data) {
void SwordScreen::renderParallax(uint8 *data) { void SwordScreen::renderParallax(uint8 *data) {
ParallaxHeader *header = (ParallaxHeader*)data; ParallaxHeader *header = (ParallaxHeader*)data;
uint32 *lineIndexes = (uint32*)(data + sizeof(ParallaxHeader));
assert((FROM_LE_16(header->sizeX) >= SCREEN_WIDTH) && (FROM_LE_16(header->sizeY) >= SCREEN_DEPTH)); assert((FROM_LE_16(header->sizeX) >= SCREEN_WIDTH) && (FROM_LE_16(header->sizeY) >= SCREEN_DEPTH));
double scrlfx, scrlfy; double scrlfx, scrlfy;
@ -458,7 +459,7 @@ void SwordScreen::renderParallax(uint8 *data) {
scrlY = 0; scrlY = 0;
for (uint16 cnty = 0; cnty < SCREEN_DEPTH; cnty++) { for (uint16 cnty = 0; cnty < SCREEN_DEPTH; cnty++) {
uint8 *src = data + READ_LE_UINT32(header->lineIndexes + cnty + scrlY); uint8 *src = data + READ_LE_UINT32(lineIndexes + cnty + scrlY);
uint8 *dest = _screenBuf + SwordLogic::_scriptVars[SCROLL_OFFSET_X] + (cnty + SwordLogic::_scriptVars[SCROLL_OFFSET_Y]) * _scrnSizeX; uint8 *dest = _screenBuf + SwordLogic::_scriptVars[SCROLL_OFFSET_X] + (cnty + SwordLogic::_scriptVars[SCROLL_OFFSET_Y]) * _scrnSizeX;
uint16 remain = scrlX; uint16 remain = scrlX;
uint16 xPos = 0; uint16 xPos = 0;

1
sword1/sworddefs.h
View file

@ -85,7 +85,6 @@ struct ParallaxHeader {
char type[16]; char type[16];
uint16 sizeX; uint16 sizeX;
uint16 sizeY; uint16 sizeY;
uint32 lineIndexes[2]; //2 is arbitrary number
} GCC_PACK; } GCC_PACK;
struct AnimUnit { struct AnimUnit {