From 0f3ed50cfc6d1542d95a9d07c557572043c3060b Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 30 Oct 2010 17:28:27 +0000
Subject: GOB: Make some more map properties protected

svn-id: r53952
---
 engines/gob/inter_v2.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'engines/gob/inter_v2.cpp')

diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index 100a3572aa..2cb430ff9b 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -432,7 +432,7 @@ void Inter_v2::o2_loadMultObject() {
 		obj.gobDestY = val;
 		obj.goblinY = val;
 
-		*(obj.pPosX) *= _vm->_map->_tilesWidth;
+		*(obj.pPosX) *= _vm->_map->getTilesWidth();
 
 		layer = objAnim.layer;
 		animation = obj.goblinStates[layer][0].animation;
@@ -447,14 +447,14 @@ void Inter_v2::o2_loadMultObject() {
 		_vm->_scenery->updateAnim(layer, 0, animation, 0,
 				*(obj.pPosX), *(obj.pPosY), 0);
 
-		if (!_vm->_map->_bigTiles)
-			*(obj.pPosY) = (obj.goblinY + 1) * _vm->_map->_tilesHeight
+		if (!_vm->_map->hasBigTiles())
+			*(obj.pPosY) = (obj.goblinY + 1) * _vm->_map->getTilesHeight()
 				- (_vm->_scenery->_animBottom - _vm->_scenery->_animTop);
 		else
-			*(obj.pPosY) = ((obj.goblinY + 1) * _vm->_map->_tilesHeight) -
+			*(obj.pPosY) = ((obj.goblinY + 1) * _vm->_map->getTilesHeight()) -
 				(_vm->_scenery->_animBottom - _vm->_scenery->_animTop) -
 				((obj.goblinY + 1) / 2);
-		*(obj.pPosX) = obj.goblinX * _vm->_map->_tilesWidth;
+		*(obj.pPosX) = obj.goblinX * _vm->_map->getTilesWidth();
 
 	} else if ((objAnim.animType == 101) && (objIndex < _vm->_goblin->_gobsCount)) {
 
@@ -778,14 +778,14 @@ void Inter_v2::o2_setGoblinState() {
 		_vm->_scenery->updateAnim(layer, 0, animation, 0,
 				*(obj.pPosX), *(obj.pPosY), 0);
 
-		if (_vm->_map->_bigTiles)
-			*(obj.pPosY) = ((obj.goblinY + 1) * _vm->_map->_tilesHeight) -
+		if (_vm->_map->hasBigTiles())
+			*(obj.pPosY) = ((obj.goblinY + 1) * _vm->_map->getTilesHeight()) -
 				(_vm->_scenery->_animBottom - _vm->_scenery->_animTop) -
 				((obj.goblinY + 1) / 2);
 		else
-			*(obj.pPosY) = ((obj.goblinY + 1) * _vm->_map->_tilesHeight) -
+			*(obj.pPosY) = ((obj.goblinY + 1) * _vm->_map->getTilesHeight()) -
 				(_vm->_scenery->_animBottom - _vm->_scenery->_animTop);
-		*(obj.pPosX) = obj.goblinX * _vm->_map->_tilesWidth;
+		*(obj.pPosX) = obj.goblinX * _vm->_map->getTilesWidth();
 		break;
 	}
 }
-- 
cgit v1.2.3