Changed tricky variable access from pointers to a new class that minds endianess.

This should fix a few regressions with BE games on LE systems and vice versa that I introduced when I changed how variables are stored (which was necessary to get Woodruff work on BE systems).

svn-id: r33014

1 files changed, 139 insertions, 191 deletions

diff --git a/engines/gob/goblin.cpp b/engines/gob/goblin.cpp
index e7aed0790e..5add0b9cea 100644
--- a/engines/gob/goblin.cpp
+++ b/engines/gob/goblin.cpp
@@ -78,58 +78,6 @@ Goblin::Goblin(GobEngine *vm) : _vm(vm) {
 	_pressedMapY = 0;
 	_pathExistence = 0;
 
-	_some0ValPtr = 0;
-
-	_gobRetVarPtr = 0;
-	_curGobVarPtr = 0;
-	_curGobXPosVarPtr = 0;
-	_curGobYPosVarPtr = 0;
-	_itemInPocketVarPtr = 0;
-
-	_curGobStateVarPtr = 0;
-	_curGobFrameVarPtr = 0;
-	_curGobMultStateVarPtr = 0;
-	_curGobNextStateVarPtr = 0;
-	_curGobScrXVarPtr = 0;
-	_curGobScrYVarPtr = 0;
-	_curGobLeftVarPtr = 0;
-	_curGobTopVarPtr = 0;
-	_curGobRightVarPtr = 0;
-	_curGobBottomVarPtr = 0;
-	_curGobDoAnimVarPtr = 0;
-	_curGobOrderVarPtr = 0;
-	_curGobNoTickVarPtr = 0;
-	_curGobTypeVarPtr = 0;
-	_curGobMaxTickVarPtr = 0;
-	_curGobTickVarPtr = 0;
-	_curGobActStartStateVarPtr = 0;
-	_curGobLookDirVarPtr = 0;
-	_curGobPickableVarPtr = 0;
-	_curGobRelaxVarPtr = 0;
-	_curGobMaxFrameVarPtr = 0;
-
-	_destItemStateVarPtr = 0;
-	_destItemFrameVarPtr = 0;
-	_destItemMultStateVarPtr = 0;
-	_destItemNextStateVarPtr = 0;
-	_destItemScrXVarPtr = 0;
-	_destItemScrYVarPtr = 0;
-	_destItemLeftVarPtr = 0;
-	_destItemTopVarPtr = 0;
-	_destItemRightVarPtr = 0;
-	_destItemBottomVarPtr = 0;
-	_destItemDoAnimVarPtr = 0;
-	_destItemOrderVarPtr = 0;
-	_destItemNoTickVarPtr = 0;
-	_destItemTypeVarPtr = 0;
-	_destItemMaxTickVarPtr = 0;
-	_destItemTickVarPtr = 0;
-	_destItemActStartStVarPtr = 0;
-	_destItemLookDirVarPtr = 0;
-	_destItemPickableVarPtr = 0;
-	_destItemRelaxVarPtr = 0;
-	_destItemMaxFrameVarPtr = 0;
-
 	_destItemType = 0;
 	_destItemState = 0;
 	for (int i = 0; i < 20; i++) {
@@ -690,7 +638,7 @@ void Goblin::switchGoblin(int16 index) {
 	_gobDestY = tmp;
 	_vm->_map->_curGoblinY = tmp;
 
-	*_curGobVarPtr = _currentGoblin;
+	_curGobVarPtr = (uint32) _currentGoblin;
 	_pathExistence = 0;
 	_readyToAct = 0;
 }
@@ -1250,172 +1198,172 @@ void Goblin::loadObjects(const char *source) {
 
 void Goblin::saveGobDataToVars(int16 xPos, int16 yPos, int16 someVal) {
 	Gob_Object *obj;
-	*_some0ValPtr = someVal;
-	*_curGobXPosVarPtr = xPos;
-	*_curGobYPosVarPtr = yPos;
-	*_itemInPocketVarPtr = _itemIndInPocket;
+	_some0ValPtr = (uint32) someVal;
+	_curGobXPosVarPtr = (uint32) xPos;
+	_curGobYPosVarPtr = (uint32) yPos;
+	_itemInPocketVarPtr = (uint32) _itemIndInPocket;
 
 	obj = _goblins[_currentGoblin];
 
-	*_curGobStateVarPtr = obj->state;
-	*_curGobFrameVarPtr = obj->curFrame;
-	*_curGobMultStateVarPtr = obj->multState;
-	*_curGobNextStateVarPtr = obj->nextState;
-	*_curGobScrXVarPtr = obj->xPos;
-	*_curGobScrYVarPtr = obj->yPos;
-	*_curGobLeftVarPtr = obj->left;
-	*_curGobTopVarPtr = obj->top;
-	*_curGobRightVarPtr = obj->right;
-	*_curGobBottomVarPtr = obj->bottom;
-	*_curGobDoAnimVarPtr = obj->doAnim;
-	*_curGobOrderVarPtr = obj->order;
-	*_curGobNoTickVarPtr = obj->noTick;
-	*_curGobTypeVarPtr = obj->type;
-	*_curGobMaxTickVarPtr = obj->maxTick;
-	*_curGobTickVarPtr = obj->tick;
-	*_curGobActStartStateVarPtr = obj->actionStartState;
-	*_curGobLookDirVarPtr = obj->curLookDir;
-	*_curGobPickableVarPtr = obj->pickable;
-	*_curGobRelaxVarPtr = obj->relaxTime;
-	*_curGobMaxFrameVarPtr = getObjMaxFrame(obj);
+	_curGobStateVarPtr = (uint32) obj->state;
+	_curGobFrameVarPtr = (uint32) obj->curFrame;
+	_curGobMultStateVarPtr = (uint32) obj->multState;
+	_curGobNextStateVarPtr = (uint32) obj->nextState;
+	_curGobScrXVarPtr = (uint32) obj->xPos;
+	_curGobScrYVarPtr = (uint32) obj->yPos;
+	_curGobLeftVarPtr = (uint32) obj->left;
+	_curGobTopVarPtr = (uint32) obj->top;
+	_curGobRightVarPtr = (uint32) obj->right;
+	_curGobBottomVarPtr = (uint32) obj->bottom;
+	_curGobDoAnimVarPtr = (uint32) obj->doAnim;
+	_curGobOrderVarPtr = (uint32) obj->order;
+	_curGobNoTickVarPtr = (uint32) obj->noTick;
+	_curGobTypeVarPtr = (uint32) obj->type;
+	_curGobMaxTickVarPtr = (uint32) obj->maxTick;
+	_curGobTickVarPtr = (uint32) obj->tick;
+	_curGobActStartStateVarPtr = (uint32) obj->actionStartState;
+	_curGobLookDirVarPtr = (uint32) obj->curLookDir;
+	_curGobPickableVarPtr = (uint32) obj->pickable;
+	_curGobRelaxVarPtr = (uint32) obj->relaxTime;
+	_curGobMaxFrameVarPtr = (uint32) getObjMaxFrame(obj);
 
 	if (_actDestItemDesc == 0)
 		return;
 
 	obj = _actDestItemDesc;
-	*_destItemStateVarPtr = obj->state;
-	*_destItemFrameVarPtr = obj->curFrame;
-	*_destItemMultStateVarPtr = obj->multState;
-	*_destItemNextStateVarPtr = obj->nextState;
-	*_destItemScrXVarPtr = obj->xPos;
-	*_destItemScrYVarPtr = obj->yPos;
-	*_destItemLeftVarPtr = obj->left;
-	*_destItemTopVarPtr = obj->top;
-	*_destItemRightVarPtr = obj->right;
-	*_destItemBottomVarPtr = obj->bottom;
-	*_destItemDoAnimVarPtr = obj->doAnim;
-	*_destItemOrderVarPtr = obj->order;
-	*_destItemNoTickVarPtr = obj->noTick;
-	*_destItemTypeVarPtr = obj->type;
-	*_destItemMaxTickVarPtr = obj->maxTick;
-	*_destItemTickVarPtr = obj->tick;
-	*_destItemActStartStVarPtr = obj->actionStartState;
-	*_destItemLookDirVarPtr = obj->curLookDir;
-	*_destItemPickableVarPtr = obj->pickable;
-	*_destItemRelaxVarPtr = obj->relaxTime;
-	*_destItemMaxFrameVarPtr = getObjMaxFrame(obj);
+	_destItemStateVarPtr = (uint32) obj->state;
+	_destItemFrameVarPtr = (uint32) obj->curFrame;
+	_destItemMultStateVarPtr = (uint32) obj->multState;
+	_destItemNextStateVarPtr = (uint32) obj->nextState;
+	_destItemScrXVarPtr = (uint32) obj->xPos;
+	_destItemScrYVarPtr = (uint32) obj->yPos;
+	_destItemLeftVarPtr = (uint32) obj->left;
+	_destItemTopVarPtr = (uint32) obj->top;
+	_destItemRightVarPtr = (uint32) obj->right;
+	_destItemBottomVarPtr = (uint32) obj->bottom;
+	_destItemDoAnimVarPtr = (uint32) obj->doAnim;
+	_destItemOrderVarPtr = (uint32) obj->order;
+	_destItemNoTickVarPtr = (uint32) obj->noTick;
+	_destItemTypeVarPtr = (uint32) obj->type;
+	_destItemMaxTickVarPtr = (uint32) obj->maxTick;
+	_destItemTickVarPtr = (uint32) obj->tick;
+	_destItemActStartStVarPtr = (uint32) obj->actionStartState;
+	_destItemLookDirVarPtr = (uint32) obj->curLookDir;
+	_destItemPickableVarPtr = (uint32) obj->pickable;
+	_destItemRelaxVarPtr = (uint32) obj->relaxTime;
+	_destItemMaxFrameVarPtr = (uint32) getObjMaxFrame(obj);
 
 	_destItemState = obj->state;
 	_destItemType = obj->type;
 }
 
 void Goblin::initVarPointers(void) {
-	_gobRetVarPtr = (int32 *)VAR_ADDRESS(59);
-	_curGobStateVarPtr = (int32 *)VAR_ADDRESS(60);
-	_curGobFrameVarPtr = (int32 *)VAR_ADDRESS(61);
-	_curGobMultStateVarPtr = (int32 *)VAR_ADDRESS(62);
-	_curGobNextStateVarPtr = (int32 *)VAR_ADDRESS(63);
-	_curGobScrXVarPtr = (int32 *)VAR_ADDRESS(64);
-	_curGobScrYVarPtr = (int32 *)VAR_ADDRESS(65);
-	_curGobLeftVarPtr = (int32 *)VAR_ADDRESS(66);
-	_curGobTopVarPtr = (int32 *)VAR_ADDRESS(67);
-	_curGobRightVarPtr = (int32 *)VAR_ADDRESS(68);
-	_curGobBottomVarPtr = (int32 *)VAR_ADDRESS(69);
-	_curGobDoAnimVarPtr = (int32 *)VAR_ADDRESS(70);
-	_curGobOrderVarPtr = (int32 *)VAR_ADDRESS(71);
-	_curGobNoTickVarPtr = (int32 *)VAR_ADDRESS(72);
-	_curGobTypeVarPtr = (int32 *)VAR_ADDRESS(73);
-	_curGobMaxTickVarPtr = (int32 *)VAR_ADDRESS(74);
-	_curGobTickVarPtr = (int32 *)VAR_ADDRESS(75);
-	_curGobActStartStateVarPtr = (int32 *)VAR_ADDRESS(76);
-	_curGobLookDirVarPtr = (int32 *)VAR_ADDRESS(77);
-	_curGobPickableVarPtr = (int32 *)VAR_ADDRESS(80);
-	_curGobRelaxVarPtr = (int32 *)VAR_ADDRESS(81);
-	_destItemStateVarPtr = (int32 *)VAR_ADDRESS(82);
-	_destItemFrameVarPtr = (int32 *)VAR_ADDRESS(83);
-	_destItemMultStateVarPtr = (int32 *)VAR_ADDRESS(84);
-	_destItemNextStateVarPtr = (int32 *)VAR_ADDRESS(85);
-	_destItemScrXVarPtr = (int32 *)VAR_ADDRESS(86);
-	_destItemScrYVarPtr = (int32 *)VAR_ADDRESS(87);
-	_destItemLeftVarPtr = (int32 *)VAR_ADDRESS(88);
-	_destItemTopVarPtr = (int32 *)VAR_ADDRESS(89);
-	_destItemRightVarPtr = (int32 *)VAR_ADDRESS(90);
-	_destItemBottomVarPtr = (int32 *)VAR_ADDRESS(91);
-	_destItemDoAnimVarPtr = (int32 *)VAR_ADDRESS(92);
-	_destItemOrderVarPtr = (int32 *)VAR_ADDRESS(93);
-	_destItemNoTickVarPtr = (int32 *)VAR_ADDRESS(94);
-	_destItemTypeVarPtr = (int32 *)VAR_ADDRESS(95);
-	_destItemMaxTickVarPtr = (int32 *)VAR_ADDRESS(96);
-	_destItemTickVarPtr = (int32 *)VAR_ADDRESS(97);
-	_destItemActStartStVarPtr = (int32 *)VAR_ADDRESS(98);
-	_destItemLookDirVarPtr = (int32 *)VAR_ADDRESS(99);
-	_destItemPickableVarPtr = (int32 *)VAR_ADDRESS(102);
-	_destItemRelaxVarPtr = (int32 *)VAR_ADDRESS(103);
-	_destItemMaxFrameVarPtr = (int32 *)VAR_ADDRESS(105);
-	_curGobVarPtr = (int32 *)VAR_ADDRESS(106);
-	_some0ValPtr = (int32 *)VAR_ADDRESS(107);
-	_curGobXPosVarPtr = (int32 *)VAR_ADDRESS(108);
-	_curGobYPosVarPtr = (int32 *)VAR_ADDRESS(109);
-	_curGobMaxFrameVarPtr = (int32 *)VAR_ADDRESS(110);
-
-	_itemInPocketVarPtr = (int32 *)VAR_ADDRESS(114);
-
-	*_itemInPocketVarPtr = -2;
+	_gobRetVarPtr.set(*_vm->_inter->_variables, 236);
+	_curGobStateVarPtr.set(*_vm->_inter->_variables, 240);
+	_curGobFrameVarPtr.set(*_vm->_inter->_variables, 244);
+	_curGobMultStateVarPtr.set(*_vm->_inter->_variables, 248);
+	_curGobNextStateVarPtr.set(*_vm->_inter->_variables, 252);
+	_curGobScrXVarPtr.set(*_vm->_inter->_variables, 256);
+	_curGobScrYVarPtr.set(*_vm->_inter->_variables, 260);
+	_curGobLeftVarPtr.set(*_vm->_inter->_variables, 264);
+	_curGobTopVarPtr.set(*_vm->_inter->_variables, 268);
+	_curGobRightVarPtr.set(*_vm->_inter->_variables, 272);
+	_curGobBottomVarPtr.set(*_vm->_inter->_variables, 276);
+	_curGobDoAnimVarPtr.set(*_vm->_inter->_variables, 280);
+	_curGobOrderVarPtr.set(*_vm->_inter->_variables, 284);
+	_curGobNoTickVarPtr.set(*_vm->_inter->_variables, 288);
+	_curGobTypeVarPtr.set(*_vm->_inter->_variables, 292);
+	_curGobMaxTickVarPtr.set(*_vm->_inter->_variables, 296);
+	_curGobTickVarPtr.set(*_vm->_inter->_variables, 300);
+	_curGobActStartStateVarPtr.set(*_vm->_inter->_variables, 304);
+	_curGobLookDirVarPtr.set(*_vm->_inter->_variables, 308);
+	_curGobPickableVarPtr.set(*_vm->_inter->_variables, 320);
+	_curGobRelaxVarPtr.set(*_vm->_inter->_variables, 324);
+	_destItemStateVarPtr.set(*_vm->_inter->_variables, 328);
+	_destItemFrameVarPtr.set(*_vm->_inter->_variables, 332);
+	_destItemMultStateVarPtr.set(*_vm->_inter->_variables, 336);
+	_destItemNextStateVarPtr.set(*_vm->_inter->_variables, 340);
+	_destItemScrXVarPtr.set(*_vm->_inter->_variables, 344);
+	_destItemScrYVarPtr.set(*_vm->_inter->_variables, 348);
+	_destItemLeftVarPtr.set(*_vm->_inter->_variables, 352);
+	_destItemTopVarPtr.set(*_vm->_inter->_variables, 356);
+	_destItemRightVarPtr.set(*_vm->_inter->_variables, 360);
+	_destItemBottomVarPtr.set(*_vm->_inter->_variables, 364);
+	_destItemDoAnimVarPtr.set(*_vm->_inter->_variables, 368);
+	_destItemOrderVarPtr.set(*_vm->_inter->_variables, 372);
+	_destItemNoTickVarPtr.set(*_vm->_inter->_variables, 376);
+	_destItemTypeVarPtr.set(*_vm->_inter->_variables, 380);
+	_destItemMaxTickVarPtr.set(*_vm->_inter->_variables, 384);
+	_destItemTickVarPtr.set(*_vm->_inter->_variables, 388);
+	_destItemActStartStVarPtr.set(*_vm->_inter->_variables, 392);
+	_destItemLookDirVarPtr.set(*_vm->_inter->_variables, 396);
+	_destItemPickableVarPtr.set(*_vm->_inter->_variables, 408);
+	_destItemRelaxVarPtr.set(*_vm->_inter->_variables, 412);
+	_destItemMaxFrameVarPtr.set(*_vm->_inter->_variables, 420);
+	_curGobVarPtr.set(*_vm->_inter->_variables, 424);
+	_some0ValPtr.set(*_vm->_inter->_variables, 428);
+	_curGobXPosVarPtr.set(*_vm->_inter->_variables, 432);
+	_curGobYPosVarPtr.set(*_vm->_inter->_variables, 436);
+	_curGobMaxFrameVarPtr.set(*_vm->_inter->_variables, 440);
+
+	_itemInPocketVarPtr.set(*_vm->_inter->_variables, 456);
+
+	_itemInPocketVarPtr = (uint32) -2;
 }
 
 void Goblin::loadGobDataFromVars(void) {
 	Gob_Object *obj;
 
-	_itemIndInPocket = *_itemInPocketVarPtr;
+	_itemIndInPocket = (int32) _itemInPocketVarPtr;
 
 	obj = _goblins[_currentGoblin];
 
-	obj->state = *_curGobStateVarPtr;
-	obj->curFrame = *_curGobFrameVarPtr;
-	obj->multState = *_curGobMultStateVarPtr;
-	obj->nextState = *_curGobNextStateVarPtr;
-	obj->xPos = *_curGobScrXVarPtr;
-	obj->yPos = *_curGobScrYVarPtr;
-	obj->left = *_curGobLeftVarPtr;
-	obj->top = *_curGobTopVarPtr;
-	obj->right = *_curGobRightVarPtr;
-	obj->bottom = *_curGobBottomVarPtr;
-	obj->doAnim = *_curGobDoAnimVarPtr;
-	obj->order = *_curGobOrderVarPtr;
-	obj->noTick = *_curGobNoTickVarPtr;
-	obj->type = *_curGobTypeVarPtr;
-	obj->maxTick = *_curGobMaxTickVarPtr;
-	obj->tick = *_curGobTickVarPtr;
-	obj->actionStartState = *_curGobActStartStateVarPtr;
-	obj->curLookDir = *_curGobLookDirVarPtr;
-	obj->pickable = *_curGobPickableVarPtr;
-	obj->relaxTime = *_curGobRelaxVarPtr;
+	obj->state = (int32) _curGobStateVarPtr;
+	obj->curFrame = (int32) _curGobFrameVarPtr;
+	obj->multState = (int32) _curGobMultStateVarPtr;
+	obj->nextState = (int32) _curGobNextStateVarPtr;
+	obj->xPos = (int32) _curGobScrXVarPtr;
+	obj->yPos = (int32) _curGobScrYVarPtr;
+	obj->left = (int32) _curGobLeftVarPtr;
+	obj->top = (int32) _curGobTopVarPtr;
+	obj->right = (int32) _curGobRightVarPtr;
+	obj->bottom = (int32) _curGobBottomVarPtr;
+	obj->doAnim = (int32) _curGobDoAnimVarPtr;
+	obj->order = (int32) _curGobOrderVarPtr;
+	obj->noTick = (int32) _curGobNoTickVarPtr;
+	obj->type = (int32) _curGobTypeVarPtr;
+	obj->maxTick = (int32) _curGobMaxTickVarPtr;
+	obj->tick = (int32) _curGobTickVarPtr;
+	obj->actionStartState = (int32) _curGobActStartStateVarPtr;
+	obj->curLookDir = (int32) _curGobLookDirVarPtr;
+	obj->pickable = (int32) _curGobPickableVarPtr;
+	obj->relaxTime = (int32) _curGobRelaxVarPtr;
 
 	if (_actDestItemDesc == 0)
 		return;
 
 	obj = _actDestItemDesc;
 
-	obj->state = *_destItemStateVarPtr;
-	obj->curFrame = *_destItemFrameVarPtr;
-	obj->multState = *_destItemMultStateVarPtr;
-	obj->nextState = *_destItemNextStateVarPtr;
-	obj->xPos = *_destItemScrXVarPtr;
-	obj->yPos = *_destItemScrYVarPtr;
-	obj->left = *_destItemLeftVarPtr;
-	obj->top = *_destItemTopVarPtr;
-	obj->right = *_destItemRightVarPtr;
-	obj->bottom = *_destItemBottomVarPtr;
-	obj->doAnim = *_destItemDoAnimVarPtr;
-	obj->order = *_destItemOrderVarPtr;
-	obj->noTick = *_destItemNoTickVarPtr;
-	obj->type = *_destItemTypeVarPtr;
-	obj->maxTick = *_destItemMaxTickVarPtr;
-	obj->tick = *_destItemTickVarPtr;
-	obj->actionStartState = *_destItemActStartStVarPtr;
-	obj->curLookDir = *_destItemLookDirVarPtr;
-	obj->pickable = *_destItemPickableVarPtr;
-	obj->relaxTime = *_destItemRelaxVarPtr;
+	obj->state = (int32) _destItemStateVarPtr;
+	obj->curFrame = (int32) _destItemFrameVarPtr;
+	obj->multState = (int32) _destItemMultStateVarPtr;
+	obj->nextState = (int32) _destItemNextStateVarPtr;
+	obj->xPos = (int32) _destItemScrXVarPtr;
+	obj->yPos = (int32) _destItemScrYVarPtr;
+	obj->left = (int32) _destItemLeftVarPtr;
+	obj->top = (int32) _destItemTopVarPtr;
+	obj->right = (int32) _destItemRightVarPtr;
+	obj->bottom = (int32) _destItemBottomVarPtr;
+	obj->doAnim = (int32) _destItemDoAnimVarPtr;
+	obj->order = (int32) _destItemOrderVarPtr;
+	obj->noTick = (int32) _destItemNoTickVarPtr;
+	obj->type = (int32) _destItemTypeVarPtr;
+	obj->maxTick = (int32) _destItemMaxTickVarPtr;
+	obj->tick = (int32) _destItemTickVarPtr;
+	obj->actionStartState = (int32) _destItemActStartStVarPtr;
+	obj->curLookDir = (int32) _destItemLookDirVarPtr;
+	obj->pickable = (int32) _destItemPickableVarPtr;
+	obj->relaxTime = (int32) _destItemRelaxVarPtr;
 
 	if (obj->type != _destItemType)
 		obj->toRedraw = 1;