[Scummvm-cvs-logs] CVS: scummvm/gob draw.cpp,1.15,1.16 game.cpp,1.29,1.30 goblin.cpp,1.25,1.26 inter.cpp,1.26,1.27 inter.h,1.5,1.6 map.cpp,1.18,1.19 map.h,1.12,1.13 palanim.cpp,1.12,1.13 palanim.h,1.5,1.6

Eugene Sandulenko sev at users.sourceforge.net
Tue Jan 3 17:24:06 CET 2006


Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2199

Modified Files:
	draw.cpp game.cpp goblin.cpp inter.cpp inter.h map.cpp map.h 
	palanim.cpp palanim.h 
Log Message:
More work on renaming class variables with underscore prefix


Index: draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/draw.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- draw.cpp	3 Jan 2006 23:14:39 -0000	1.15
+++ draw.cpp	4 Jan 2006 01:23:20 -0000	1.16
@@ -233,7 +233,7 @@
 	if (gcursorIndex == 4)
 		blitCursor();
 
-	if (_vm->_inter->terminate)
+	if (_vm->_inter->_terminate)
 		return;
 
 	if (noInvalidated && applyPal == 0)

Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/game.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- game.cpp	3 Jan 2006 23:14:39 -0000	1.29
+++ game.cpp	4 Jan 2006 01:23:20 -0000	1.30
@@ -457,10 +457,10 @@
 		    handleMouse);
 	}
 
-	if (_vm->_inter->soundEndTimeKey != 0
-	    && _vm->_util->getTimeKey() >= _vm->_inter->soundEndTimeKey) {
-		_vm->_snd->stopSound(_vm->_inter->soundStopVal);
-		_vm->_inter->soundEndTimeKey = 0;
+	if (_vm->_inter->_soundEndTimeKey != 0
+	    && _vm->_util->getTimeKey() >= _vm->_inter->_soundEndTimeKey) {
+		_vm->_snd->stopSound(_vm->_inter->_soundStopVal);
+		_vm->_inter->_soundEndTimeKey = 0;
 	}
 
 	if (_vm->_global->useMouse == 0)
@@ -515,7 +515,7 @@
 
 	timeKey = _vm->_util->getTimeKey();
 	while (1) {
-		if (_vm->_inter->terminate != 0) {
+		if (_vm->_inter->_terminate) {
 			if (handleMouse)
 				_vm->_draw->blitCursor();
 			return 0;
@@ -811,12 +811,11 @@
 			if (key != 0 || activeCollResId != 0)
 				break;
 
-			if (_vm->_inter->terminate != 0)
+			if (_vm->_inter->_terminate)
 				return 0;
 		}
 
-		if (key == 0 || activeCollResId != 0
-		    || _vm->_inter->terminate != 0)
+		if (key == 0 || activeCollResId != 0 || _vm->_inter->_terminate)
 			return 0;
 
 		switch (key) {
@@ -1013,7 +1012,7 @@
 		    _vm->_global->inter_variables + collArea->key,
 		    inpDesc[*pCurPos].fontIndex, collArea->flags, &time);
 
-		if (_vm->_inter->terminate != 0)
+		if (_vm->_inter->_terminate)
 			return 0;
 
 		switch (key) {
@@ -1525,7 +1524,7 @@
 		WRITE_VAR(16, 0);
 		activeCollResId = 0;
 	}
-	while (activeCollResId == 0 && _vm->_inter->terminate == 0);
+	while (activeCollResId == 0 && !_vm->_inter->_terminate);
 
 	if (((uint16)activeCollResId & ~0x8000) == collResId) {
 		collStackPos = 0;
@@ -1595,7 +1594,7 @@
 	}
 
 	savedIP = 0;
-	if (_vm->_inter->terminate == 0) {
+	if (!_vm->_inter->_terminate) {
 		savedIP = (char *)totFileData +
 		    collisionAreas[activeCollIndex].funcLeave;
 
@@ -1741,13 +1740,13 @@
 	char *savedIP;
 	int16 i;
 
-	oldNestLevel = _vm->_inter->nestLevel;
-	oldBreakFrom = _vm->_inter->breakFromLevel;
+	oldNestLevel = _vm->_inter->_nestLevel;
+	oldBreakFrom = _vm->_inter->_breakFromLevel;
 	oldCaptureCounter = _vm->_scenery->pCaptureCounter;
 	savedIP = _vm->_global->inter_execPtr;
 
-	_vm->_inter->nestLevel = &nestLevel;
-	_vm->_inter->breakFromLevel = &breakFrom;
+	_vm->_inter->_nestLevel = &nestLevel;
+	_vm->_inter->_breakFromLevel = &breakFrom;
 	_vm->_scenery->pCaptureCounter = &captureCounter;
 	strcpy(savedTotName, curTotFile);
 
@@ -1870,7 +1869,7 @@
 			_vm->_inter->callSub(2);
 
 			if (totToLoad[0] != 0)
-				_vm->_inter->terminate = 0;
+				_vm->_inter->_terminate = false;
 
 			variablesCount = READ_LE_UINT32((char *)totFileData + 0x2c);
 			_vm->_draw->blitInvalidated();
@@ -1921,8 +1920,8 @@
 
 	strcpy(curTotFile, savedTotName);
 
-	_vm->_inter->nestLevel = oldNestLevel;
-	_vm->_inter->breakFromLevel = oldBreakFrom;
+	_vm->_inter->_nestLevel = oldNestLevel;
+	_vm->_inter->_breakFromLevel = oldBreakFrom;
 	_vm->_scenery->pCaptureCounter = oldCaptureCounter;
 	_vm->_global->inter_execPtr = savedIP;
 }

Index: goblin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/goblin.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- goblin.cpp	3 Jan 2006 23:14:39 -0000	1.25
+++ goblin.cpp	4 Jan 2006 01:23:20 -0000	1.26
@@ -660,16 +660,16 @@
 	else
 		next = index - 1;
 
-	if (_vm->_map->passMap[_vm->_map->curGoblinY][_vm->_map->curGoblinX] == 3 ||
-	    _vm->_map->passMap[_vm->_map->curGoblinY][_vm->_map->curGoblinX] == 6)
+	if (_vm->_map->_passMap[_vm->_map->_curGoblinY][_vm->_map->_curGoblinX] == 3 ||
+	    _vm->_map->_passMap[_vm->_map->_curGoblinY][_vm->_map->_curGoblinX] == 6)
 		return;
 
 	if (goblins[(currentGoblin + 1) % 3]->type != 0 &&
 	    goblins[(currentGoblin + 2) % 3]->type != 0)
[...1093 lines suppressed...]
+		_vm->_map->_itemPoses[item].x = xPos;
+		_vm->_map->_itemPoses[item].y = yPos;
+		_vm->_map->_itemPoses[item].orient = val;
 		break;
 
 	case 1000:
@@ -3174,11 +3174,11 @@
 			gobDesc->toRedraw = 1;
 
 			pressedMapX = gobPositions[0].x;
-			_vm->_map->destX = gobPositions[0].x;
+			_vm->_map->_destX = gobPositions[0].x;
 			gobDestX = gobPositions[0].x;
 
 			pressedMapY = gobPositions[0].y;
-			_vm->_map->destY = gobPositions[0].y;
+			_vm->_map->_destY = gobPositions[0].y;
 			gobDestY = gobPositions[0].y;
 
 			*curGobVarPtr = 0;

Index: inter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/inter.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- inter.cpp	3 Jan 2006 23:14:39 -0000	1.26
+++ inter.cpp	4 Jan 2006 01:23:20 -0000	1.27
@@ -34,15 +34,15 @@
 namespace Gob {
 
 Inter::Inter(GobEngine *vm) : _vm(vm) {
-	terminate = 0;
-	breakFlag = 0;
-	animPalLowIndex = 0;
-	animPalHighIndex = 0;
-	animPalDir = 0;
-	soundEndTimeKey = 0;
-	soundStopVal = 0;
-	breakFromLevel = 0;
-	nestLevel = 0;
+	_terminate = false;
+	_breakFlag = false;
+	_animPalLowIndex = 0;
+	_animPalHighIndex = 0;
+	_animPalDir = 0;
+	_soundEndTimeKey = 0;
+	_soundStopVal = 0;
+	_breakFromLevel = 0;
+	_nestLevel = 0;
 }
 
 int16 Inter::load16(void) {
@@ -197,24 +197,24 @@
 	int16 i;
 	Video::Color col;
 
-	if (animPalDir == 0)
+	if (_animPalDir == 0)
 		return;
 
 	_vm->_video->waitRetrace(_vm->_global->videoMode);
 
-	if (animPalDir == -1) {
-		col = _vm->_draw->vgaSmallPalette[animPalLowIndex];
+	if (_animPalDir == -1) {
+		col = _vm->_draw->vgaSmallPalette[_animPalLowIndex];
 
-		for (i = animPalLowIndex; i < animPalHighIndex; i++)
+		for (i = _animPalLowIndex; i < _animPalHighIndex; i++)
 			_vm->_draw->vgaSmallPalette[i] = _vm->_draw->vgaSmallPalette[i + 1];
 
-		_vm->_draw->vgaSmallPalette[animPalHighIndex] = col;
+		_vm->_draw->vgaSmallPalette[_animPalHighIndex] = col;
 	} else {
-		col = _vm->_draw->vgaSmallPalette[animPalHighIndex];
-		for (i = animPalHighIndex; i > animPalLowIndex; i--)
+		col = _vm->_draw->vgaSmallPalette[_animPalHighIndex];
+		for (i = _animPalHighIndex; i > _animPalLowIndex; i--)
 			_vm->_draw->vgaSmallPalette[i] = _vm->_draw->vgaSmallPalette[i - 1];
 
-		_vm->_draw->vgaSmallPalette[animPalLowIndex] = col;
+		_vm->_draw->vgaSmallPalette[_animPalLowIndex] = col;
 	}
 
 	_vm->_global->pPaletteDesc->vgaPal = _vm->_draw->vgaSmallPalette;
@@ -222,9 +222,9 @@
 }
 
 void Inter::animPalInit(void) {
-	animPalDir = load16();
-	animPalLowIndex = _vm->_parse->parseValExpr();
-	animPalHighIndex = _vm->_parse->parseValExpr();
+	_animPalDir = load16();
+	_animPalLowIndex = _vm->_parse->parseValExpr();
+	_animPalHighIndex = _vm->_parse->parseValExpr();
 }
 
 void Inter::loadMult(void) {
@@ -920,7 +920,7 @@
 
 void Inter::stopSound(void) {
 	_vm->_snd->stopSound(_vm->_parse->parseValExpr());
-	soundEndTimeKey = 0;
+	_soundEndTimeKey = 0;
 }
 
 void Inter::playSound(void) {
@@ -934,7 +934,7 @@
 	frequency = _vm->_parse->parseValExpr();
 
 	_vm->_snd->stopSound(0);
-	soundEndTimeKey = 0;
+	_soundEndTimeKey = 0;
 	if (_vm->_game->soundSamples[index] == 0)
 		return;
 
@@ -943,16 +943,16 @@
 			return;
 
 		repCount = -repCount;
-		soundEndTimeKey = _vm->_util->getTimeKey();
+		_soundEndTimeKey = _vm->_util->getTimeKey();
 
 		if (frequency == 0) {
 			freq2 = _vm->_game->soundSamples[index]->frequency;
 		} else {
 			freq2 = frequency;
 		}
-		soundStopVal =
+		_soundStopVal =
 		    (10 * (_vm->_game->soundSamples[index]->size / 2)) / freq2;
-		soundEndTimeKey +=
+		_soundEndTimeKey +=
 		    ((_vm->_game->soundSamples[index]->size * repCount -
 			_vm->_game->soundSamples[index]->size / 2) * 1000) / freq2;
 	}
@@ -1029,7 +1029,7 @@
 	}
 
 	strcat(buf, ".tot");
-	terminate = 1;
+	_terminate = true;
 	strcpy(_vm->_game->totToLoad, buf);
 }
 
@@ -1166,7 +1166,7 @@
 		for (i = 0; i < len; i++) {
 			evalExpr(0);
 
-			if (terminate != 0)
+			if (_terminate)
 				return;
 
 			if (_vm->_global->inter_resVal == value) {
@@ -1203,7 +1203,7 @@
 	char flag;
 
 	debug(4, "repeatUntil");
-	nestLevel[0]++;
+	_nestLevel[0]++;
 	blockPtr = _vm->_global->inter_execPtr;
 
 	do {
@@ -1213,13 +1213,13 @@
 		funcBlock(1);
 		_vm->_global->inter_execPtr = blockPtr + size + 1;
 		flag = evalBoolResult();
-	} while (flag == 0 && breakFlag == 0 && terminate == 0);
+	} while (flag == 0 && !_breakFlag && !_terminate);
 
-	nestLevel[0]--;
+	_nestLevel[0]--;
 
-	if (*breakFromLevel > -1) {
-		breakFlag = 0;
-		*breakFromLevel = -1;
+	if (*_breakFromLevel > -1) {
+		_breakFlag = false;
+		*_breakFromLevel = -1;
 	}
 }
 
@@ -1230,12 +1230,12 @@
 	int16 size;
 
 	debug(4, "whileDo");
-	nestLevel[0]++;
+	_nestLevel[0]++;
 	do {
 		savedIP = _vm->_global->inter_execPtr;
 		flag = evalBoolResult();
 
-		if (terminate != 0)
+		if (_terminate)
 			return;
 
 		blockPtr = _vm->_global->inter_execPtr;
@@ -1249,17 +1249,17 @@
 			_vm->_global->inter_execPtr += size;
 		}
 
-		if (breakFlag != 0 || terminate != 0) {
+		if (_breakFlag || _terminate) {
 			_vm->_global->inter_execPtr = blockPtr;
 			_vm->_global->inter_execPtr += size;
 			break;
 		}
 	} while (flag != 0);
 
-	nestLevel[0]--;
-	if (*breakFromLevel > -1) {
-		breakFlag = 0;
-		*breakFromLevel = -1;
+	_nestLevel[0]--;
+	if (*_breakFromLevel > -1) {
+		_breakFlag = false;
+		*_breakFromLevel = -1;
 	}
 }
 
@@ -1275,7 +1275,7 @@
 	if (_vm->_global->inter_execPtr == 0)
 		return;
 
-	breakFlag = 0;
+	_breakFlag = false;
 	_vm->_global->inter_execPtr++;
 	cmdCount = *_vm->_global->inter_execPtr++;
 	_vm->_global->inter_execPtr += 2;
@@ -1287,7 +1287,7 @@
 
 	counter = 0;
 	do {
-		if (terminate != 0)
+		if (_terminate)
 			break;
 
 		cmd = (byte)*_vm->_global->inter_execPtr;
@@ -1440,7 +1440,7 @@
 			switch (cmd) {
 			case 0:
 				if (retFlag != 2)
-					breakFlag = 1;
+					_breakFlag = true;
 
 				_vm->_global->inter_execPtr = 0;
 				return;
@@ -1479,16 +1479,16 @@
 			switch (cmd) {
 			case 0:
 				if (retFlag == 1) {
-					breakFlag = 1;
+					_breakFlag = true;
 					_vm->_global->inter_execPtr = 0;
 					return;
 				}
 
-				if (*nestLevel == 0)
+				if (*_nestLevel == 0)
 					break;
 
-				*breakFromLevel = *nestLevel;
-				breakFlag = 1;
+				*_breakFromLevel = *_nestLevel;
+				_breakFlag = true;
 				_vm->_global->inter_execPtr = 0;
 				return;
 
@@ -1626,12 +1626,12 @@
 
 		}
 
-		if (breakFlag != 0) {
+		if (_breakFlag) {
 			if (retFlag != 2)
 				break;
 
-			if (*breakFromLevel == -1)
-				breakFlag = 0;
+			if (*_breakFromLevel == -1)
+				_breakFlag = false;
 			break;
 		}
 	} while (counter != cmdCount);
@@ -1641,15 +1641,15 @@
 }
 
 void Inter::initControlVars(void) {
-	*nestLevel = 0;
-	*breakFromLevel = -1;
+	*_nestLevel = 0;
+	*_breakFromLevel = -1;
 
 	*_vm->_scenery->pCaptureCounter = 0;
 
-	breakFlag = 0;
-	terminate = 0;
-	animPalDir = 0;
-	soundEndTimeKey = 0;
+	_breakFlag = false;
+	_terminate = false;
+	_animPalDir = 0;
+	_soundEndTimeKey = 0;
 }
 
 void Inter::callSub(int16 retFlag) {
@@ -1664,7 +1664,7 @@
 	}
 
 	if ((char *)_vm->_global->inter_execPtr == _vm->_game->totFileData)
-		terminate = 1;
+		_terminate = true;
 }
 
 } // End of namespace Gob

Index: inter.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/inter.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- inter.h	3 Jan 2006 23:14:39 -0000	1.5
+++ inter.h	4 Jan 2006 01:23:20 -0000	1.6
@@ -26,15 +26,15 @@
 
 class Inter {
 public:
-	int16 animPalLowIndex;
-	int16 animPalHighIndex;
-	int16 animPalDir;
-	uint32 soundEndTimeKey;
-	int16 soundStopVal;
-	char terminate;
-	char breakFlag;
-	int16 *breakFromLevel;
-	int16 *nestLevel;
+	int16 _animPalLowIndex;
+	int16 _animPalHighIndex;
+	int16 _animPalDir;
+	uint32 _soundEndTimeKey;
+	int16 _soundStopVal;
+	char _terminate;
+	char _breakFlag;
+	int16 *_breakFromLevel;
+	int16 *_nestLevel;
 
 	int16 load16(void);
 	int16 peek16(char *ptr);

Index: map.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/map.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- map.cpp	3 Jan 2006 23:14:39 -0000	1.18
+++ map.cpp	4 Jan 2006 01:23:20 -0000	1.19
@@ -34,35 +34,35 @@
 Map::Map(GobEngine *vm) : _vm(vm) {
 	for (int i = 0; i < kMapHeight; i++)
 		for (int j = 0; j < kMapWidth; j++) {
-			passMap[i][j] = 0;
-			itemsMap[i][j] = 0;
+			_passMap[i][j] = 0;
+			_itemsMap[i][j] = 0;
 		}
 	for (int i = 0; i < 40; i++) {
-		wayPoints[i].x = 0;
-		wayPoints[i].y = 0;
+		_wayPoints[i].x = 0;
+		_wayPoints[i].y = 0;
 	}
 	for (int i = 0; i < 40; i++) {
-		itemPoses[i].x = 0;
-		itemPoses[i].y = 0;
-		itemPoses[i].orient = 0;
+		_itemPoses[i].x = 0;
+		_itemPoses[i].y = 0;
+		_itemPoses[i].orient = 0;
 	}
 
-	nearestWayPoint = 0;
-	nearestDest = 0;
-	curGoblinX = 0;
-	curGoblinY = 0;
-	destX = 0;
-	destY = 0;
-	loadFromAvo = 0;
-	sourceFile[0] = 0;
-	avoDataPtr = 0;
+	_nearestWayPoint = 0;
+	_nearestDest = 0;
+	_curGoblinX = 0;
+	_curGoblinY = 0;
+	_destX = 0;
+	_destY = 0;
+	_loadFromAvo = 0;
+	_sourceFile[0] = 0;
+	_avoDataPtr = 0;
 }
 
 void Map::placeItem(int16 x, int16 y, int16 id) {
-	if ((itemsMap[y][x] & 0xff00) != 0)
-		itemsMap[y][x] = (itemsMap[y][x] & 0xff00) | id;
+	if ((_itemsMap[y][x] & 0xff00) != 0)
+		_itemsMap[y][x] = (_itemsMap[y][x] & 0xff00) | id;
 	else
-		itemsMap[y][x] = (itemsMap[y][x] & 0x00ff) | (id << 8);
+		_itemsMap[y][x] = (_itemsMap[y][x] & 0x00ff) | (id << 8);
 }
 
 enum {
@@ -91,63 +91,63 @@
 	else if (x1 < x0)
 		dir |= kLeft;
 
-	if (passMap[y0][x0] == 3 && (dir & kUp)) {
-		if (passMap[y0 - 1][x0] != 0)
+	if (_passMap[y0][x0] == 3 && (dir & kUp)) {
+		if (_passMap[y0 - 1][x0] != 0)
 			return kDirN;
 	}
 
-	if (passMap[y0][x0] == 3 && (dir & kDown)) {
-		if (passMap[y0 + 1][x0] != 0)
+	if (_passMap[y0][x0] == 3 && (dir & kDown)) {
+		if (_passMap[y0 + 1][x0] != 0)
 			return kDirS;
 	}
 
-	if (passMap[y0][x0] == 6 && (dir & kUp)) {
-		if (passMap[y0 - 1][x0] != 0)
+	if (_passMap[y0][x0] == 6 && (dir & kUp)) {
+		if (_passMap[y0 - 1][x0] != 0)
 			return kDirN;
 	}
 
-	if (passMap[y0][x0] == 6 && (dir & kDown)) {
-		if (passMap[y0 + 1][x0] != 0)
+	if (_passMap[y0][x0] == 6 && (dir & kDown)) {
+		if (_passMap[y0 + 1][x0] != 0)
 			return kDirS;
 	}
 
 	if (dir == kLeft) {
-		if (x0 - 1 >= 0 && passMap[y0][x0 - 1] != 0)
+		if (x0 - 1 >= 0 && _passMap[y0][x0 - 1] != 0)
 			return kDirW;
 		return 0;
 	}
 
 	if (dir == kRight) {
-		if (x0 + 1 < kMapWidth && passMap[y0][x0 + 1] != 0)
+		if (x0 + 1 < kMapWidth && _passMap[y0][x0 + 1] != 0)
 			return kDirE;
 		return 0;
 	}
 
 	if (dir == kUp) {
-		if (y0 - 1 >= 0 && passMap[y0 - 1][x0] != 0)
+		if (y0 - 1 >= 0 && _passMap[y0 - 1][x0] != 0)
 			return kDirN;
 
 		if (y0 - 1 >= 0 && x0 - 1 >= 0
-		    && passMap[y0 - 1][x0 - 1] != 0)
+		    && _passMap[y0 - 1][x0 - 1] != 0)
 			return kDirNW;
 
 		if (y0 - 1 >= 0 && x0 + 1 < kMapWidth
-		    && passMap[y0 - 1][x0 + 1] != 0)
+		    && _passMap[y0 - 1][x0 + 1] != 0)
 			return kDirNE;
 
 		return 0;
 	}
 
 	if (dir == kDown) {
-		if (y0 + 1 < kMapHeight && passMap[y0 + 1][x0] != 0)
+		if (y0 + 1 < kMapHeight && _passMap[y0 + 1][x0] != 0)
 			return kDirS;
 
 		if (y0 + 1 < kMapHeight && x0 - 1 >= 0
-		    && passMap[y0 + 1][x0 - 1] != 0)
+		    && _passMap[y0 + 1][x0 - 1] != 0)
 			return kDirSW;
 
 		if (y0 + 1 < kMapHeight && x0 + 1 < kMapWidth
-		    && passMap[y0 + 1][x0 + 1] != 0)
+		    && _passMap[y0 + 1][x0 + 1] != 0)
 			return kDirSE;
 
 		return 0;
@@ -155,13 +155,13 @@
 
 	if (dir == (kRight | kUp)) {
 		if (y0 - 1 >= 0 && x0 + 1 < kMapWidth
-		    && passMap[y0 - 1][x0 + 1] != 0)
+		    && _passMap[y0 - 1][x0 + 1] != 0)
 			return kDirNE;
 
-		if (y0 - 1 >= 0 && passMap[y0 - 1][x0] != 0)
+		if (y0 - 1 >= 0 && _passMap[y0 - 1][x0] != 0)
 			return kDirN;
 
-		if (x0 + 1 < kMapWidth && passMap[y0][x0 + 1] != 0)
+		if (x0 + 1 < kMapWidth && _passMap[y0][x0 + 1] != 0)
 			return kDirE;
 
 		return 0;
@@ -169,13 +169,13 @@
 
 	if (dir == (kRight | kDown)) {
 		if (x0 + 1 < kMapWidth && y0 + 1 < kMapHeight
-		    && passMap[y0 + 1][x0 + 1] != 0)
+		    && _passMap[y0 + 1][x0 + 1] != 0)
 			return kDirSE;
 
-		if (y0 + 1 < kMapHeight && passMap[y0 + 1][x0] != 0)
+		if (y0 + 1 < kMapHeight && _passMap[y0 + 1][x0] != 0)
 			return kDirS;
 
-		if (x0 + 1 < kMapWidth && passMap[y0][x0 + 1] != 0)
+		if (x0 + 1 < kMapWidth && _passMap[y0][x0 + 1] != 0)
 			return kDirE;
 
 		return 0;
@@ -183,13 +183,13 @@
 
 	if (dir == (kLeft | kUp)) {
 		if (x0 - 1 >= 0 && y0 - 1 >= 0
-		    && passMap[y0 - 1][x0 - 1] != 0)
+		    && _passMap[y0 - 1][x0 - 1] != 0)
 			return kDirNW;
 
-		if (y0 - 1 >= 0 && passMap[y0 - 1][x0] != 0)
+		if (y0 - 1 >= 0 && _passMap[y0 - 1][x0] != 0)
 			return kDirN;
 
-		if (x0 - 1 >= 0 && passMap[y0][x0 - 1] != 0)
+		if (x0 - 1 >= 0 && _passMap[y0][x0 - 1] != 0)
 			return kDirW;
 
 		return 0;
@@ -197,13 +197,13 @@
 
 	if (dir == (kLeft | kDown)) {
 		if (x0 - 1 >= 0 && y0 + 1 < kMapHeight
-		    && passMap[y0 + 1][x0 - 1] != 0)
+		    && _passMap[y0 + 1][x0 - 1] != 0)
 			return kDirSW;
 
-		if (y0 + 1 < kMapHeight && passMap[y0 + 1][x0] != 0)
+		if (y0 + 1 < kMapHeight && _passMap[y0 + 1][x0] != 0)
 			return kDirS;
 
-		if (x0 - 1 >= 0 && passMap[y0][x0 - 1] != 0)
+		if (x0 - 1 >= 0 && _passMap[y0][x0 - 1] != 0)
 			return kDirW;
 
 		return 0;
@@ -220,12 +220,12 @@
 	length = 30000;
 
 	for (i = 0; i < 40; i++) {
-		if (wayPoints[i].x < 0 ||
-				wayPoints[i].x >= kMapWidth ||
-				wayPoints[i].y < 0 || wayPoints[i].y >= kMapHeight)
+		if (_wayPoints[i].x < 0 ||
+				_wayPoints[i].x >= kMapWidth ||
+				_wayPoints[i].y < 0 || _wayPoints[i].y >= kMapHeight)
 			return -1;
 
-		tmp = ABS(x - wayPoints[i].x) + ABS(y - wayPoints[i].y);
+		tmp = ABS(x - _wayPoints[i].x) + ABS(y - _wayPoints[i].y);
 
 		if (tmp <= length) {
 			lnearestWayPoint = i;
@@ -237,17 +237,17 @@
 }
 
 void Map::findNearestToGob(void) {
-	int16 wayPoint = findNearestWayPoint(curGoblinX, curGoblinY);
+	int16 wayPoint = findNearestWayPoint(_curGoblinX, _curGoblinY);
 
 	if (wayPoint != -1)
-		nearestWayPoint = wayPoint;
+		_nearestWayPoint = wayPoint;
 }
 
 void Map::findNearestToDest(void) {
-	int16 wayPoint = findNearestWayPoint(destX, destY);
+	int16 wayPoint = findNearestWayPoint(_destX, _destY);
 
 	if (wayPoint != -1)
-		nearestDest = wayPoint;
+		_nearestDest = wayPoint;
 }
 
 int16 Map::checkDirectPath(int16 x0, int16 y0, int16 x1, int16 y1) {
@@ -324,20 +324,20 @@
 
 			nextLink = 0;
 			if (i0 > i1) {
-				curX = wayPoints[i0].x;
-				curY = wayPoints[i0].y;
+				curX = _wayPoints[i0].x;
+				curY = _wayPoints[i0].y;
 				i0--;
 			} else if (i0 < i1) {
-				curX = wayPoints[i0].x;
-				curY = wayPoints[i0].y;
+				curX = _wayPoints[i0].x;
+				curY = _wayPoints[i0].y;
 				i0++;
 			} else if (i0 == i1) {
-				curX = wayPoints[i0].x;
-				curY = wayPoints[i0].y;
+				curX = _wayPoints[i0].x;
+				curY = _wayPoints[i0].y;
 			}
 		}
-		if (i0 == i1 && wayPoints[i0].x == x0
-		    && wayPoints[i0].y == y0) {
+		if (i0 == i1 && _wayPoints[i0].x == x0
+		    && _wayPoints[i0].y == y0) {
 			if (checkDirectPath(x0, y0, x1, y1) == 1)
 				return 1;
 			return 0;
@@ -389,29 +389,29 @@
 void Map::optimizePoints(void) {
 	int16 i;
 
-	if (nearestWayPoint < nearestDest) {
-		for (i = nearestWayPoint; i <= nearestDest; i++) {
-			if (checkDirectPath(curGoblinX, curGoblinY,
-				wayPoints[i].x, wayPoints[i].y) == 1)
-				nearestWayPoint = i;
+	if (_nearestWayPoint < _nearestDest) {
+		for (i = _nearestWayPoint; i <= _nearestDest; i++) {
+			if (checkDirectPath(_curGoblinX, _curGoblinY,
+				_wayPoints[i].x, _wayPoints[i].y) == 1)
+				_nearestWayPoint = i;
 		}
-	} else if (nearestWayPoint > nearestDest) {
-		for (i = nearestWayPoint; i >= nearestDest; i--) {
-			if (checkDirectPath(curGoblinX, curGoblinY,
-				wayPoints[i].x, wayPoints[i].y) == 1)
-				nearestWayPoint = i;
+	} else if (_nearestWayPoint > _nearestDest) {
+		for (i = _nearestWayPoint; i >= _nearestDest; i--) {
+			if (checkDirectPath(_curGoblinX, _curGoblinY,
+				_wayPoints[i].x, _wayPoints[i].y) == 1)
+				_nearestWayPoint = i;
 		}
 	}
 }
 
 void Map::loadDataFromAvo(char *dest, int16 size) {
-	memcpy(dest, avoDataPtr, size);
-	avoDataPtr += size;
+	memcpy(dest, _avoDataPtr, size);
+	_avoDataPtr += size;
 }
 
 uint16 Map::loadFromAvo_LE_UINT16() {
-	uint16 tmp = READ_LE_UINT16(avoDataPtr);
-	avoDataPtr += 2;
+	uint16 tmp = READ_LE_UINT16(_avoDataPtr);
+	_avoDataPtr += 2;
 	return tmp;
 }
 
@@ -424,12 +424,12 @@
 	if (flag == 0)
 		return;
 
-	avoDataPtr += 1456;
+	_avoDataPtr += 1456;
 	count = loadFromAvo_LE_UINT16();
 	for (i = 0; i < count; i++) {
-		avoDataPtr += 20;
+		_avoDataPtr += 20;
 		_vm->_goblin->itemToObject[i] = loadFromAvo_LE_UINT16();
-		avoDataPtr += 5;
+		_avoDataPtr += 5;
 	}
 }
 
@@ -455,60 +455,60 @@
 	int16 count2;
 	int16 count3;
 
-	strcpy(avoName, sourceFile);
+	strcpy(avoName, _sourceFile);
 	strcat(avoName, ".avo");
 
 	handle = _vm->_dataio->openData(avoName);
 	if (handle >= 0) {
-		loadFromAvo = 1;
+		_loadFromAvo = 1;
 		_vm->_dataio->closeData(handle);
-		avoDataPtr = _vm->_dataio->getData(avoName);
-		dataBuf = avoDataPtr;
-		loadDataFromAvo((char *)passMap, kMapHeight * kMapWidth);
+		_avoDataPtr = _vm->_dataio->getData(avoName);
+		dataBuf = _avoDataPtr;
+		loadDataFromAvo((char *)_passMap, kMapHeight * kMapWidth);
 
 		for (y = 0; y < kMapHeight; y++) {
 			for (x = 0; x < kMapWidth; x++) {
 				loadDataFromAvo(&item, 1);
-				itemsMap[y][x] = item;
+				_itemsMap[y][x] = item;
 			}
 		}
 
 		for (i = 0; i < 40; i++) {
-			wayPoints[i].x = loadFromAvo_LE_UINT16();
-			wayPoints[i].y = loadFromAvo_LE_UINT16();
+			_wayPoints[i].x = loadFromAvo_LE_UINT16();
+			_wayPoints[i].y = loadFromAvo_LE_UINT16();
 		}
-		loadDataFromAvo((char *)itemPoses, szMap_ItemPos * 20);
+		loadDataFromAvo((char *)_itemPoses, szMap_ItemPos * 20);
 	} else {
-		loadFromAvo = 0;
-		avoDataPtr = _vm->_dataio->getData(avjFile);
-		dataBuf = avoDataPtr;
+		_loadFromAvo = 0;
+		_avoDataPtr = _vm->_dataio->getData(avjFile);
+		dataBuf = _avoDataPtr;
 	}
 
-	avoDataPtr += 32;
-	avoDataPtr += 76;
-	avoDataPtr += 4;
-	avoDataPtr += 20;
+	_avoDataPtr += 32;
+	_avoDataPtr += 76;
+	_avoDataPtr += 4;
+	_avoDataPtr += 20;
 
 	for (i = 0; i < 3; i++) {
 		tmp = loadFromAvo_LE_UINT16();
-		avoDataPtr += tmp * 14;
+		_avoDataPtr += tmp * 14;
 	}
 
 	soundCount = loadFromAvo_LE_UINT16();
-	savedPtr = avoDataPtr;
+	savedPtr = _avoDataPtr;
 
-	avoDataPtr += 14 * soundCount;
-	avoDataPtr += 4;
-	avoDataPtr += 24;
+	_avoDataPtr += 14 * soundCount;
+	_avoDataPtr += 4;
+	_avoDataPtr += 24;
 
 	count2 = loadFromAvo_LE_UINT16();
 	count3 = loadFromAvo_LE_UINT16();
 
-	savedPtr2 = avoDataPtr;
-	avoDataPtr += count2 * 8;
+	savedPtr2 = _avoDataPtr;
+	_avoDataPtr += count2 * 8;
 
-	savedPtr3 = avoDataPtr;
-	avoDataPtr += count3 * 8;
+	savedPtr3 = _avoDataPtr;
+	_avoDataPtr += count3 * 8;
 
 	_vm->_goblin->gobsCount = loadFromAvo_LE_UINT16();
 	for (i = 0; i < _vm->_goblin->gobsCount; i++) {
@@ -533,9 +533,9 @@
 
 		// FIXME: All is wrong further. We should unwind calls to loadDataFromAvo()
 		loadDataFromAvo((char *)_vm->_goblin->goblins[i]->stateMach, 40 * szGob_StateLine);
-		avoDataPtr += 160;
-		_vm->_goblin->goblins[i]->multObjIndex = *avoDataPtr;
-		avoDataPtr += 2;
+		_avoDataPtr += 160;
+		_vm->_goblin->goblins[i]->multObjIndex = *_avoDataPtr;
+		_avoDataPtr += 2;
 
 		_vm->_goblin->goblins[i]->realStateMach = _vm->_goblin->goblins[i]->stateMach;
 		for (state = 0; state < 40; state++) {
@@ -548,16 +548,16 @@
 
 				tmpState->animation = loadFromAvo_LE_UINT16();
 				tmpState->layer = loadFromAvo_LE_UINT16();
-				avoDataPtr += 8;
+				_avoDataPtr += 8;
 				tmpState->unk0 = loadFromAvo_LE_UINT16();
 				tmpState->unk1 = loadFromAvo_LE_UINT16();
 
-				avoDataPtr += 2;
-				if (READ_LE_UINT32(avoDataPtr) != 0) {
-					avoDataPtr += 4;
+				_avoDataPtr += 2;
+				if (READ_LE_UINT32(_avoDataPtr) != 0) {
+					_avoDataPtr += 4;
 					tmpState->sndItem = loadFromAvo_LE_UINT16();
 				} else {
-					avoDataPtr += 6;
+					_avoDataPtr += 6;
 					tmpState->sndItem = -1;
 				}
 				tmpState->freq = loadFromAvo_LE_UINT16();
@@ -630,9 +630,9 @@
 		_vm->_goblin->objects[i]->stateMach = (Goblin::Gob_StateLine *)malloc(szGob_StateLine * 40);
 
 		loadDataFromAvo((char *)_vm->_goblin->objects[i]->stateMach, 40 * szGob_StateLine);
-		avoDataPtr += 160;
-		_vm->_goblin->objects[i]->multObjIndex = *avoDataPtr;
-		avoDataPtr += 2;
+		_avoDataPtr += 160;
+		_vm->_goblin->objects[i]->multObjIndex = *_avoDataPtr;
+		_avoDataPtr += 2;
 
 		_vm->_goblin->objects[i]->realStateMach = _vm->_goblin->objects[i]->stateMach;
 		for (state = 0; state < 40; state++) {
@@ -645,16 +645,16 @@
 
 				tmpState->animation = loadFromAvo_LE_UINT16();
 				tmpState->layer = loadFromAvo_LE_UINT16();
-				avoDataPtr += 8;
+				_avoDataPtr += 8;
 				tmpState->unk0 = loadFromAvo_LE_UINT16();
 				tmpState->unk1 = loadFromAvo_LE_UINT16();
 
-				avoDataPtr += 2;
-				if (READ_LE_UINT32(avoDataPtr) != 0) {
-					avoDataPtr += 4;
+				_avoDataPtr += 2;
+				if (READ_LE_UINT32(_avoDataPtr) != 0) {
+					_avoDataPtr += 4;
 					tmpState->sndItem = loadFromAvo_LE_UINT16();
 				} else {
-					avoDataPtr += 6;
+					_avoDataPtr += 6;
 					tmpState->sndItem = -1;
 				}
 				tmpState->freq = loadFromAvo_LE_UINT16();
@@ -689,19 +689,19 @@
 
 	state = loadFromAvo_LE_UINT16();
 	for (i = 0; i < state; i++) {
-		avoDataPtr += 30;
+		_avoDataPtr += 30;
 
 		loadDataFromAvo((char *)&flag, 4);
-		avoDataPtr += 56;
+		_avoDataPtr += 56;
 
 		if (flag != 0)
-			avoDataPtr += 30;
+			_avoDataPtr += 30;
 	}
 
 	loadDataFromAvo((char *)&tmp, 2);
-	avoDataPtr += 48;
+	_avoDataPtr += 48;
 	loadItemToObject();
-	avoDataPtr = savedPtr;
+	_avoDataPtr = savedPtr;
 
 	for (i = 0; i < soundCount; i++) {
 		loadDataFromAvo(buf, 14);
@@ -727,7 +727,7 @@
 	int16 layer;
 	int16 i;
 
-	if (loadFromAvo == 0)
+	if (_loadFromAvo == 0)
 		error("load: Loading .pas/.pos files is not supported!");
 
 	for (i = 0; i < 3; i++) {

Index: map.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/map.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- map.h	3 Jan 2006 23:14:39 -0000	1.12
+++ map.h	4 Jan 2006 01:23:20 -0000	1.13
@@ -60,20 +60,20 @@
 
 #pragma END_PACK_STRUCTS
 
-	int8 passMap[kMapHeight][kMapWidth];	// [y][x]
-	int16 itemsMap[kMapHeight][kMapWidth];	// [y][x]
-	Point wayPoints[40];
-	int16 nearestWayPoint;
-	int16 nearestDest;
+	int8 _passMap[kMapHeight][kMapWidth];	// [y][x]
+	int16 _itemsMap[kMapHeight][kMapWidth];	// [y][x]
+	Point _wayPoints[40];
+	int16 _nearestWayPoint;
+	int16 _nearestDest;
 
-   	int16 curGoblinX;
-	int16 curGoblinY;
-	int16 destX;
-	int16 destY;
-	int8 loadFromAvo;
+   	int16 _curGoblinX;
+	int16 _curGoblinY;
+	int16 _destX;
+	int16 _destY;
+	int8 _loadFromAvo;
 
-	ItemPos itemPoses[40];
-	char sourceFile[15];
+	ItemPos _itemPoses[40];
+	char _sourceFile[15];
 
 	void placeItem(int16 x, int16 y, int16 id);
 
@@ -91,7 +91,7 @@
 	Map(GobEngine *vm);
 
 protected:
-	char *avoDataPtr;
+	char *_avoDataPtr;
 	GobEngine *_vm;
 
 	int16 findNearestWayPoint(int16 x, int16 y);

Index: palanim.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/palanim.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- palanim.cpp	3 Jan 2006 23:14:39 -0000	1.12
+++ palanim.cpp	4 Jan 2006 01:23:20 -0000	1.13
@@ -28,19 +28,19 @@
 namespace Gob {
 
 PalAnim::PalAnim(GobEngine *vm) : _vm(vm) {
-	fadeValue = 1;
+	_fadeValue = 1;
 	for (int i = 0; i < 256; i++) {
-		toFadeRed[i] = 0;
-		toFadeGreen[i] = 0;
-		toFadeBlue[i] = 0;
+		_toFadeRed[i] = 0;
+		_toFadeGreen[i] = 0;
+		_toFadeBlue[i] = 0;
 	}
 }
 
 char PalAnim::fadeColor(char from, char to) {
-	if ((int16)from - fadeValue > (int16)to)
-		return from - fadeValue;
-	else if ((int16)from + fadeValue < (int16)to)
-		return from + fadeValue;
+	if ((int16)from - _fadeValue > (int16)to)
+		return from - _fadeValue;
+	else if ((int16)from + _fadeValue < (int16)to)
+		return from + _fadeValue;
 	else
 		return to;
 }
@@ -62,15 +62,9 @@
 				error("fade: _vm->_global->inVM != 0 not supported.");
 
 			for (i = 0; i < 256; i++) {
-				newRed =
-				    fadeColor(_vm->_global->redPalette[i],
-				    toFadeRed[i]);
-				newGreen =
-				    fadeColor(_vm->_global->greenPalette[i],
-				    toFadeGreen[i]);
-				newBlue =
-				    fadeColor(_vm->_global->bluePalette[i],
-				    toFadeBlue[i]);
+				newRed = fadeColor(_vm->_global->redPalette[i], _toFadeRed[i]);
+				newGreen = fadeColor(_vm->_global->greenPalette[i], _toFadeGreen[i]);
+				newBlue = fadeColor(_vm->_global->bluePalette[i], _toFadeBlue[i]);
 
 				if (_vm->_global->redPalette[i] != newRed
 				    || _vm->_global->greenPalette[i] != newGreen
@@ -89,15 +83,15 @@
 
 				_vm->_video->setPalElem(i,
 				    fadeColor(_vm->_global->redPalette[i],
-					toFadeRed[i]),
+					_toFadeRed[i]),
 				    fadeColor(_vm->_global->greenPalette[i],
-					toFadeGreen[i]),
+					_toFadeGreen[i]),
 				    fadeColor(_vm->_global->bluePalette[i],
-					toFadeBlue[i]), -1, _vm->_global->videoMode);
+					_toFadeBlue[i]), -1, _vm->_global->videoMode);
 
-				if (_vm->_global->redPalette[i] != toFadeRed[i] ||
-				    _vm->_global->greenPalette[i] != toFadeGreen[i] ||
-				    _vm->_global->bluePalette[i] != toFadeBlue[i])
+				if (_vm->_global->redPalette[i] != _toFadeRed[i] ||
+				    _vm->_global->greenPalette[i] != _toFadeGreen[i] ||
+				    _vm->_global->bluePalette[i] != _toFadeBlue[i])
 					stop = 0;
 			}
 		}
@@ -106,10 +100,10 @@
 		stop = 1;
 		for (i = 0; i < 16; i++) {
 			_vm->_video->setPalElem(i,
-			    fadeColor(_vm->_global->redPalette[i], toFadeRed[i]),
+			    fadeColor(_vm->_global->redPalette[i], _toFadeRed[i]),
 			    _vm->_global->greenPalette[i], _vm->_global->bluePalette[i], -1, _vm->_global->videoMode);
 
-			if (_vm->_global->redPalette[i] != toFadeRed[i])
+			if (_vm->_global->redPalette[i] != _toFadeRed[i])
 				stop = 0;
 		}
 		return stop;
@@ -118,10 +112,10 @@
 		for (i = 0; i < 16; i++) {
 			_vm->_video->setPalElem(i,
 			    _vm->_global->redPalette[i],
-			    fadeColor(_vm->_global->greenPalette[i], toFadeGreen[i]),
+			    fadeColor(_vm->_global->greenPalette[i], _toFadeGreen[i]),
 			    _vm->_global->bluePalette[i], -1, _vm->_global->videoMode);
 
-			if (_vm->_global->greenPalette[i] != toFadeGreen[i])
+			if (_vm->_global->greenPalette[i] != _toFadeGreen[i])
 				stop = 0;
 		}
 		return stop;
@@ -131,10 +125,10 @@
 			_vm->_video->setPalElem(i,
 			    _vm->_global->redPalette[i],
 			    _vm->_global->greenPalette[i],
-			    fadeColor(_vm->_global->bluePalette[i], toFadeBlue[i]),
+			    fadeColor(_vm->_global->bluePalette[i], _toFadeBlue[i]),
 			    -1, _vm->_global->videoMode);
 
-			if (_vm->_global->bluePalette[i] != toFadeBlue[i])
+			if (_vm->_global->bluePalette[i] != _toFadeBlue[i])
 				stop = 0;
 		}
 		return stop;
@@ -147,9 +141,9 @@
 	int16 i;
 
 	if (fadeV < 0)
-		fadeValue = -fadeV;
+		_fadeValue = -fadeV;
 	else
-		fadeValue = 2;
+		_fadeValue = 2;
 
 	if (_vm->_global->colorCount < 256) {
 		if (palDesc != 0)
@@ -160,15 +154,15 @@
 	if (_vm->_global->setAllPalette == 0) {
 		if (palDesc == 0) {
 			for (i = 0; i < 16; i++) {
-				toFadeRed[i] = 0;
-				toFadeGreen[i] = 0;
-				toFadeBlue[i] = 0;
+				_toFadeRed[i] = 0;
+				_toFadeGreen[i] = 0;
+				_toFadeBlue[i] = 0;
 			}
 		} else {
 			for (i = 0; i < 16; i++) {
-				toFadeRed[i] = palDesc->vgaPal[i].red;
-				toFadeGreen[i] = palDesc->vgaPal[i].green;
-				toFadeBlue[i] = palDesc->vgaPal[i].blue;
+				_toFadeRed[i] = palDesc->vgaPal[i].red;
+				_toFadeGreen[i] = palDesc->vgaPal[i].green;
+				_toFadeBlue[i] = palDesc->vgaPal[i].blue;
 			}
 		}
 	} else {
@@ -177,15 +171,15 @@
 
 		if (palDesc == 0) {
 			for (i = 0; i < 256; i++) {
-				toFadeRed[i] = 0;
-				toFadeGreen[i] = 0;
-				toFadeBlue[i] = 0;
+				_toFadeRed[i] = 0;
+				_toFadeGreen[i] = 0;
+				_toFadeBlue[i] = 0;
 			}
 		} else {
 			for (i = 0; i < 256; i++) {
-				toFadeRed[i] = palDesc->vgaPal[i].red;
-				toFadeGreen[i] = palDesc->vgaPal[i].green;
-				toFadeBlue[i] = palDesc->vgaPal[i].blue;
+				_toFadeRed[i] = palDesc->vgaPal[i].red;
+				_toFadeGreen[i] = palDesc->vgaPal[i].green;
+				_toFadeBlue[i] = palDesc->vgaPal[i].blue;
 			}
 		}
 	}

Index: palanim.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/palanim.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- palanim.h	3 Jan 2006 23:14:39 -0000	1.5
+++ palanim.h	4 Jan 2006 01:23:20 -0000	1.6
@@ -26,8 +26,6 @@
 
 class PalAnim {
 public:
-	int16 fadeValue;
-
 	char fadeColor(char from, char to);
 	char fadeStep(int16 oper);	// oper == 0 - fade all colors, 1, 2, 3 - red,green, blue
 	void fade(Video::PalDesc * palDesc, int16 fade, int16 all);
@@ -35,9 +33,11 @@
 	PalAnim(GobEngine *vm);
 
 protected:
-	byte toFadeRed[256];
-	byte toFadeGreen[256];
-	byte toFadeBlue[256];
+	int16 _fadeValue;
+
+	byte _toFadeRed[256];
+	byte _toFadeGreen[256];
+	byte _toFadeBlue[256];
 	GobEngine *_vm;
 };
 





More information about the Scummvm-git-logs mailing list