aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2014-12-10 08:12:37 +0100
committerPaul Gilbert2014-12-12 23:05:46 -0500
commit80dfc3537d8495bb1f096c1bd21ab4052ac0cb40 (patch)
tree69051df6640e153ae3860703e4c2fc5b26de85c4
parentcdc27778c0c07d728876ebe169d658dda666ef1f (diff)
downloadscummvm-rg350-80dfc3537d8495bb1f096c1bd21ab4052ac0cb40.tar.gz
scummvm-rg350-80dfc3537d8495bb1f096c1bd21ab4052ac0cb40.tar.bz2
scummvm-rg350-80dfc3537d8495bb1f096c1bd21ab4052ac0cb40.zip
ACCESS: Fix _help3 initialization
-rw-r--r--engines/access/amazon/amazon_game.cpp8
-rw-r--r--engines/access/amazon/amazon_game.h1
2 files changed, 4 insertions, 5 deletions
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 77ee8fe620..20d71021c2 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -47,14 +47,13 @@ AccessEngine(syst, gameDesc),
_rawInactiveX = 0;
_rawInactiveY = 0;
_inactiveYOff = 0;
- _tilePos = Common::Point(0, 0);
_hintLevel = 0;
Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
memset(_tileData, 0, sizeof(_tileData));
Common::fill(&_help1[0], &_help1[366], 0);
Common::fill(&_help2[0], &_help2[366], 0);
- Common::fill(&_help1[0], &_help3[366], 0);
+ Common::fill(&_help3[0], &_help3[366], 0);
_helpTbl[0] = _help1;
_helpTbl[1] = _help2;
_helpTbl[2] = _help3;
@@ -276,8 +275,9 @@ void AmazonEngine::tileScreen() {
_tileData[i] = res->_stream->readByte();
// CHECKME: Depending on the Vesa mode during initialization, 400 or 480
- for (_tilePos.y = 0; _tilePos.y < 480; _tilePos.y += y) {
- for (_tilePos.x = 0; _tilePos.x < 640; _tilePos.x += x)
+ Common::Point tilePos;
+ for (tilePos.y = 0; tilePos.y < 480; tilePos.y += y) {
+ for (tilePos.x = 0; tilePos.x < 640; tilePos.x += x)
warning("TODO: DRAWOBJECT");
}
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 30b9b80778..e475542772 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -34,7 +34,6 @@ class AmazonEngine;
class AmazonEngine : public AccessEngine {
private:
- Common::Point _tilePos;
byte _tileData[1455];
Common::Array<CellIdent> _chapterCells;