From 7434c764c6899e114d07e756356a55595adb8694 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 26 Nov 2014 22:16:14 -0500 Subject: ACCESS: gcc compilation fixes --- engines/access/access.cpp | 1 - engines/access/access.h | 2 +- engines/access/amazon/amazon_game.cpp | 2 +- engines/access/amazon/amazon_game.h | 2 +- engines/access/amazon/amazon_resources.cpp | 6 +++--- engines/access/amazon/amazon_scripts.cpp | 6 +++--- engines/access/files.cpp | 6 +++--- engines/access/files.h | 2 +- engines/access/player.h | 2 +- engines/access/scripts.cpp | 2 -- 10 files changed, 14 insertions(+), 17 deletions(-) (limited to 'engines') diff --git a/engines/access/access.cpp b/engines/access/access.cpp index 2c973160b0..4d326acff6 100644 --- a/engines/access/access.cpp +++ b/engines/access/access.cpp @@ -220,7 +220,6 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) { soundsLeft = _countTbl[curPage]; _events->zeroKeys(); - Common::String line; int width = 0; bool lastLine = _fonts._font2.getLine(lines, s->_maxChars * 6, line, width); diff --git a/engines/access/access.h b/engines/access/access.h index 2cd35fbf1d..c0bc467f08 100644 --- a/engines/access/access.h +++ b/engines/access/access.h @@ -117,7 +117,7 @@ protected: * Support method that generates a savegame name * @param slot Slot number */ - Common::String AccessEngine::generateSaveName(int slot); + Common::String generateSaveName(int slot); /** * Play back an entire video 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()) { diff --git a/engines/access/files.cpp b/engines/access/files.cpp index dacceb7a09..df114229da 100644 --- a/engines/access/files.cpp +++ b/engines/access/files.cpp @@ -59,10 +59,10 @@ Resource::~Resource() { delete _stream; } -Resource::Resource(byte *data, int size) { - _data = data; +Resource::Resource(byte *p, int size) { + _data = p; _size = size; - _stream = new Common::MemoryReadStream(data, size); + _stream = new Common::MemoryReadStream(p, size); } byte *Resource::data() { diff --git a/engines/access/files.h b/engines/access/files.h index f65f2ba8da..f90071df85 100644 --- a/engines/access/files.h +++ b/engines/access/files.h @@ -62,7 +62,7 @@ public: int _size; Resource(); - Resource::Resource(byte *data, int size); + Resource(byte *data, int size); ~Resource(); byte *data(); }; diff --git a/engines/access/player.h b/engines/access/player.h index 400770c21a..67908a315d 100644 --- a/engines/access/player.h +++ b/engines/access/player.h @@ -111,7 +111,7 @@ public: Common::Point _rawPlayer; public: Player(AccessEngine *vm); - ~Player(); + virtual ~Player(); static Player *init(AccessEngine *vm); virtual void load(); diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp index d4bd5ad644..9aba05a2fb 100644 --- a/engines/access/scripts.cpp +++ b/engines/access/scripts.cpp @@ -610,13 +610,11 @@ void Scripts::cmdTexChoice() { findNull(); - bool choice2Fl = false; tmpStr = ""; while ((v = _data->readByte()) != 0) tmpStr += (char)v; if (tmpStr.size() != 0) { - choice2Fl = true; _vm->_bubbleBox->_bubblePtr = Common::String("RESPONSE 2").c_str(); _vm->_bubbleBox->calcBubble(tmpStr); _vm->_bubbleBox->printBubble(tmpStr); -- cgit v1.2.3