diff options
| author | eriktorbjorn | 2011-07-03 07:20:40 +0200 |
|---|---|---|
| committer | eriktorbjorn | 2011-07-03 07:20:40 +0200 |
| commit | dd7b1399f3a64a2cdcfb225f62bbfb7ed90889cf (patch) | |
| tree | d835ad07e1e58791b38495795064f411eba61e00 | |
| parent | 7e4224e52a2202ba98dd93ffe209d231e5c1d35c (diff) | |
| download | scummvm-rg350-dd7b1399f3a64a2cdcfb225f62bbfb7ed90889cf.tar.gz scummvm-rg350-dd7b1399f3a64a2cdcfb225f62bbfb7ed90889cf.tar.bz2 scummvm-rg350-dd7b1399f3a64a2cdcfb225f62bbfb7ed90889cf.zip | |
SWORD2: Silence "variable set but not used" GCC warnings
| -rw-r--r-- | engines/sword2/controls.cpp | 2 | ||||
| -rw-r--r-- | engines/sword2/render.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/sword2/controls.cpp b/engines/sword2/controls.cpp index 6ce447a4cc..3611294eb8 100644 --- a/engines/sword2/controls.cpp +++ b/engines/sword2/controls.cpp @@ -477,6 +477,8 @@ void Widget::createSurfaceImage(int state, uint32 res, int x, int y, uint32 pc) // Points to just after frame header, ie. start of sprite data _sprites[state].data = frame + FrameHeader::size(); + _sprites[state].colorTable = colTablePtr; + _sprites[state].isText = false; _vm->_screen->createSurface(&_sprites[state], &_surfaces[state]._surface); _surfaces[state]._original = true; diff --git a/engines/sword2/render.cpp b/engines/sword2/render.cpp index 1e068d6061..8bf9d922d5 100644 --- a/engines/sword2/render.cpp +++ b/engines/sword2/render.cpp @@ -699,8 +699,6 @@ int32 Screen::initializePsxBackgroundLayer(byte *parallax) { */ int32 Screen::initializePsxParallaxLayer(byte *parallax) { - uint16 plxXres, plxYres; - uint16 xTiles, yTiles; uint16 i, j, k; byte *data; byte *dst; @@ -714,10 +712,10 @@ int32 Screen::initializePsxParallaxLayer(byte *parallax) { return RD_OK; } - plxXres = READ_LE_UINT16(parallax); - plxYres = READ_LE_UINT16(parallax + 2); - xTiles = READ_LE_UINT16(parallax + 4); - yTiles = READ_LE_UINT16(parallax + 6); + // uint16 plxXres = READ_LE_UINT16(parallax); + // uint16 plxYres = READ_LE_UINT16(parallax + 2); + uint16 xTiles = READ_LE_UINT16(parallax + 4); + uint16 yTiles = READ_LE_UINT16(parallax + 6); // Beginning of parallax table composed by uint32, // if word is 0, corresponding tile contains no data and must be skipped, |