diff options
| author | Sven Hesse | 2010-10-30 17:28:27 +0000 |
|---|---|---|
| committer | Sven Hesse | 2010-10-30 17:28:27 +0000 |
| commit | 0f3ed50cfc6d1542d95a9d07c557572043c3060b (patch) | |
| tree | 269e6c76ccf503395a7a20ebd8864d9c1b8e2772 /engines/gob/inter_v1.cpp | |
| parent | 8a7d0cc249ead074d7fb5bc8ff45acb279b87f80 (diff) | |
| download | scummvm-rg350-0f3ed50cfc6d1542d95a9d07c557572043c3060b.tar.gz scummvm-rg350-0f3ed50cfc6d1542d95a9d07c557572043c3060b.tar.bz2 scummvm-rg350-0f3ed50cfc6d1542d95a9d07c557572043c3060b.zip | |
GOB: Make some more map properties protected
svn-id: r53952
Diffstat (limited to 'engines/gob/inter_v1.cpp')
| -rw-r--r-- | engines/gob/inter_v1.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index 0c2b3d2cea..6dab8161d0 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -2562,8 +2562,8 @@ void Inter_v1::animPalette() { } void Inter_v1::manipulateMap(int16 xPos, int16 yPos, int16 item) { - for (int y = 0; y < _vm->_map->_mapHeight; y++) { - for (int x = 0; x < _vm->_map->_mapWidth; x++) { + for (int y = 0; y < _vm->_map->getMapHeight(); y++) { + for (int x = 0; x < _vm->_map->getMapWidth(); x++) { if ((_vm->_map->getItem(x, y) & 0xFF) == item) _vm->_map->setItem(x, y, _vm->_map->getItem(x, y) & 0xFF00); else if (((_vm->_map->getItem(x, y) & 0xFF00) >> 8) == item) @@ -2571,7 +2571,7 @@ void Inter_v1::manipulateMap(int16 xPos, int16 yPos, int16 item) { } } - if (xPos < _vm->_map->_mapWidth - 1) { + if (xPos < _vm->_map->getMapWidth() - 1) { if (yPos > 0) { if (((_vm->_map->getItem(xPos, yPos) & 0xFF00) != 0) || ((_vm->_map->getItem(xPos, yPos - 1) & 0xFF00) != 0) || @@ -2660,7 +2660,7 @@ void Inter_v1::manipulateMap(int16 xPos, int16 yPos, int16 item) { return; } - if ((xPos < _vm->_map->_mapWidth - 2) && + if ((xPos < _vm->_map->getMapWidth() - 2) && (_vm->_map->getPass(xPos + 2, yPos) == 1)) { _vm->_map->_itemPoses[item].x = xPos + 2; _vm->_map->_itemPoses[item].y = yPos; @@ -2668,7 +2668,7 @@ void Inter_v1::manipulateMap(int16 xPos, int16 yPos, int16 item) { return; } - if ((xPos < _vm->_map->_mapWidth - 1) && + if ((xPos < _vm->_map->getMapWidth() - 1) && (_vm->_map->getPass(xPos + 1, yPos) == 1)) { _vm->_map->_itemPoses[item].x = xPos + 1; _vm->_map->_itemPoses[item].y = yPos; |