diff options
| author | Paul Gilbert | 2014-11-26 22:16:14 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-12-12 22:47:55 -0500 |
| commit | 7434c764c6899e114d07e756356a55595adb8694 (patch) | |
| tree | db6250093f030328a2a7fa154a46787164a0fcd1 /engines/access/amazon | |
| parent | 89b20c618f16f1d3ad8e33819dd9202d234aa258 (diff) | |
| download | scummvm-rg350-7434c764c6899e114d07e756356a55595adb8694.tar.gz scummvm-rg350-7434c764c6899e114d07e756356a55595adb8694.tar.bz2 scummvm-rg350-7434c764c6899e114d07e756356a55595adb8694.zip | |
ACCESS: gcc compilation fixes
Diffstat (limited to 'engines/access/amazon')
| -rw-r--r-- | engines/access/amazon/amazon_game.cpp | 2 | ||||
| -rw-r--r-- | engines/access/amazon/amazon_game.h | 2 | ||||
| -rw-r--r-- | engines/access/amazon/amazon_resources.cpp | 6 | ||||
| -rw-r--r-- | engines/access/amazon/amazon_scripts.cpp | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp index 6da895a1ce..9b9df8bc25 100644 --- a/engines/access/amazon/amazon_game.cpp +++ b/engines/access/amazon/amazon_game.cpp @@ -672,7 +672,7 @@ void AmazonEngine::helpTitle() { Common::String iqText = "IQ: "; calcIQ(); - Common::String IQSCORE = Common::String::format("d", _iqValue); + Common::String IQSCORE = Common::String::format("%d", _iqValue); while (IQSCORE.size() != 4) IQSCORE = " " + IQSCORE; diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h index 7917586ba2..2d371ca9fb 100644 --- a/engines/access/amazon/amazon_game.h +++ b/engines/access/amazon/amazon_game.h @@ -165,7 +165,7 @@ public: bool _deathFlag; int _deathCount; int _deathType; - byte *_mapPtr; + const byte *_mapPtr; int _canoeVXPos; int _canoeMoveCount; int _canoeFrame; diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp index 08ecfff467..68e078ef08 100644 --- a/engines/access/amazon/amazon_resources.cpp +++ b/engines/access/amazon/amazon_resources.cpp @@ -1653,7 +1653,7 @@ RiverStruct RIVER0OBJECTS[45] = { {17, 30, 305, 0, 2, 15} }; -RiverStruct ENDRIVER0[1] = {16, 31, 260, 0, 7, 12}; +RiverStruct ENDRIVER0[1] = { { 16, 31, 260, 0, 7, 12 } }; RiverStruct RIVER1OBJECTS[49] = { {16, 31, 6920, 0, 1, 12}, @@ -1707,7 +1707,7 @@ RiverStruct RIVER1OBJECTS[49] = { {17, 30, 305, 0, 3, 15} }; -RiverStruct ENDRIVER1[1] = {16, 31, 260, 0, 1, 12}; +RiverStruct ENDRIVER1[1] = { { 16, 31, 260, 0, 1, 12 } }; RiverStruct RIVER2OBJECTS[53] = { {16, 31, 8230, 0, 6, 12}, @@ -1765,7 +1765,7 @@ RiverStruct RIVER2OBJECTS[53] = { {17, 30, 305, 0, 3, 15} }; -RiverStruct ENDRIVER2[1] = {16, 31, 260, 0, 6, 12}; +RiverStruct ENDRIVER2[1] = { { 16, 31, 260, 0, 6, 12 } }; RiverStruct *RIVEROBJECTTBL[6] = { RIVER0OBJECTS, ENDRIVER0, RIVER1OBJECTS, diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp index 30cd6c866c..7b4729b3e0 100644 --- a/engines/access/amazon/amazon_scripts.cpp +++ b/engines/access/amazon/amazon_scripts.cpp @@ -1282,7 +1282,7 @@ void AmazonScripts::ANT() { void AmazonScripts::boatWalls(int param1, int param2) { if (param1 == 1) - _vm->_room->_plotter._walls[42] = Common::Rect(96, 27, 87, 42); + _vm->_room->_plotter._walls[42] = Common::Rect(96, 27, 96 + 87, 27 + 42); else { _vm->_room->_plotter._walls[39].bottom = _vm->_room->_plotter._walls[41].bottom = 106; _vm->_room->_plotter._walls[40].left = 94; @@ -1439,7 +1439,7 @@ void AmazonScripts::initRiver() { ++_game->_timers[3]._flag; _game->_canoeFrame = 0; - _game->_mapPtr = (byte *)MAPTBL[_game->_riverFlag] + 1; + _game->_mapPtr = (const byte *)MAPTBL[_game->_riverFlag] + 1; if (_game->_saveRiver == 1) { _game->_mapPtr--; _game->_mapPtr += _game->_mapOffset; @@ -1771,7 +1771,7 @@ void AmazonScripts::RIVER() { while (true) { _vm->_events->_vbCount = 4; - int bx = _vm->_player->_scrollAmount - _screenVertX; +// int bx = _vm->_player->_scrollAmount - _screenVertX; if (_vm->_screen->_scrollX == 0) { _vm->_sound->midiRepeat(); if (riverJumpTest()) { |