GOB: Minor map cleanup

- Move enum Direction out of class Map
- Convert kLeft et al into a proper enum RelativeDirection

svn-id: r53946

1 files changed, 36 insertions, 36 deletions

diff --git a/engines/gob/goblin_v4.cpp b/engines/gob/goblin_v4.cpp
index 25c52cef35..7758170332 100644
--- a/engines/gob/goblin_v4.cpp
+++ b/engines/gob/goblin_v4.cpp
@@ -125,18 +125,18 @@ void Goblin_v4::movePathFind(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16
 
 	if (_vm->_map->_widthByte == 4) {
 		switch (dir) {
-		case Map::kDirNW:
-			animData->nextState = turnState(animData->state, Map::kDirNW);
+		case kDirNW:
+			animData->nextState = turnState(animData->state, kDirNW);
 			if ((_vm->_map->getPass(obj->goblinX, obj->goblinY) == 10) &&
 					(animData->nextState == 1))
 				animData->nextState = 40;
 			if (_vm->_map->getPass(obj->goblinX - 1, obj->goblinY - 2) != 10)
-				animData->nextState = turnState(animData->state, Map::kDirNW);
+				animData->nextState = turnState(animData->state, kDirNW);
 			break;
 
-		case Map::kDirN:
+		case kDirN:
 			animData->nextState =
-				(animData->curLookDir == 2) ? 2 : turnState(animData->state, Map::kDirN);
+				(animData->curLookDir == 2) ? 2 : turnState(animData->state, kDirN);
 			if (_vm->_map->getPass(obj->goblinX, obj->goblinY) == 10) {
 				if (_vm->_map->getPass(obj->goblinX - 1, obj->goblinY - 2) != 10) {
 					if (_vm->_map->getPass(obj->goblinX + 1, obj->goblinY - 2) == 10)
@@ -154,35 +154,35 @@ void Goblin_v4::movePathFind(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16
 				animData->nextState = 26;
 			break;
 
-		case Map::kDirNE:
-			animData->nextState = turnState(animData->state, Map::kDirNE);
+		case kDirNE:
+			animData->nextState = turnState(animData->state, kDirNE);
 			if ((_vm->_map->getPass(obj->goblinX, obj->goblinY) == 10) &&
 			    (animData->nextState == 3))
 				animData->nextState = 42;
 			if (_vm->_map->getPass(obj->goblinX + 1, obj->goblinY - 2) != 10)
-				animData->nextState = turnState(animData->state, Map::kDirNE);
+				animData->nextState = turnState(animData->state, kDirNE);
 			break;
 
-		case Map::kDirW:
-			animData->nextState = turnState(animData->state, Map::kDirW);
+		case kDirW:
+			animData->nextState = turnState(animData->state, kDirW);
 			break;
 
-		case Map::kDirE:
-			animData->nextState = turnState(animData->state, Map::kDirE);
+		case kDirE:
+			animData->nextState = turnState(animData->state, kDirE);
 			break;
 
-		case Map::kDirSW:
-			animData->nextState = turnState(animData->state, Map::kDirSW);
+		case kDirSW:
+			animData->nextState = turnState(animData->state, kDirSW);
 			if ((_vm->_map->getPass(obj->goblinX, obj->goblinY) == 10) &&
 			    (animData->nextState == 7))
 				animData->nextState = 41;
 			if (_vm->_map->getPass(obj->goblinX - 1, obj->goblinY) != 10)
-				animData->nextState = turnState(animData->state, Map::kDirSW);
+				animData->nextState = turnState(animData->state, kDirSW);
 			break;
 
-		case Map::kDirS:
+		case kDirS:
 			animData->nextState =
-				(animData->curLookDir == 6) ? 6 : turnState(animData->state, Map::kDirS);
+				(animData->curLookDir == 6) ? 6 : turnState(animData->state, kDirS);
 			if (_vm->_map->getPass(obj->goblinX, obj->goblinY) == 10) {
 				if (_vm->_map->getPass(obj->goblinX - 1, obj->goblinY + 2) != 10) {
 					if (_vm->_map->getPass(obj->goblinX + 1, obj->goblinY + 2) == 10)
@@ -201,13 +201,13 @@ void Goblin_v4::movePathFind(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16
 				animData->nextState = 27;
 			break;
 
-		case Map::kDirSE:
-			animData->nextState = turnState(animData->state, Map::kDirSE);
+		case kDirSE:
+			animData->nextState = turnState(animData->state, kDirSE);
 			if ((_vm->_map->getPass(obj->goblinX, obj->goblinY) == 10) &&
 			    (animData->nextState == 5))
 				animData->nextState = 43;
 			if (_vm->_map->getPass(obj->goblinX + 1, obj->goblinY) != 10)
-				animData->nextState = turnState(animData->state, Map::kDirSE);
+				animData->nextState = turnState(animData->state, kDirSE);
 			break;
 
 		default:
@@ -260,7 +260,7 @@ void Goblin_v4::movePathFind(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16
 		}
 	} else {
 		switch (dir) {
-		case Map::kDirNW:
+		case kDirNW:
 			animData->nextState = 1;
 			if (_vm->_map->_screenWidth == 640) {
 				if (_vm->_map->getPass(obj->goblinX, obj->goblinY) == 10)
@@ -270,7 +270,7 @@ void Goblin_v4::movePathFind(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16
 			}
 			break;
 
-		case Map::kDirN:
+		case kDirN:
 			animData->nextState =
 				(animData->curLookDir == 2) ? 2 : rotateState(animData->curLookDir, 2);
 			if (_vm->_map->_screenWidth == 640) {
@@ -289,7 +289,7 @@ void Goblin_v4::movePathFind(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16
 			}
 			break;
 
-		case Map::kDirNE:
+		case kDirNE:
 			animData->nextState =	3;
 			if (_vm->_map->_screenWidth == 640) {
 				if (_vm->_map->getPass(obj->goblinX, obj->goblinY) == 10)
@@ -299,15 +299,15 @@ void Goblin_v4::movePathFind(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16
 			}
 			break;
 
-		case Map::kDirW:
+		case kDirW:
 			animData->nextState = rotateState(animData->curLookDir, 0);
 			break;
 
-		case Map::kDirE:
+		case kDirE:
 			animData->nextState = rotateState(animData->curLookDir, 4);
 			break;
 
-		case Map::kDirSW:
+		case kDirSW:
 			animData->nextState = 7;
 			if (_vm->_map->_screenWidth == 640) {
 				if (_vm->_map->getPass(obj->goblinX, obj->goblinY) == 10)
@@ -317,7 +317,7 @@ void Goblin_v4::movePathFind(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16
 			}
 			break;
 
-		case Map::kDirS:
+		case kDirS:
 			animData->nextState =
 				(animData->curLookDir == 6) ? 6 : rotateState(animData->curLookDir, 6);
 			if (_vm->_map->_screenWidth == 640) {
@@ -328,7 +328,7 @@ void Goblin_v4::movePathFind(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16
 			}
 			break;
 
-		case Map::kDirSE:
+		case kDirSE:
 			animData->nextState = 5;
 			if (_vm->_map->_screenWidth == 640) {
 				if (_vm->_map->getPass(obj->goblinX, obj->goblinY) == 10)
@@ -589,35 +589,35 @@ int16 Goblin_v4::turnState(int16 state, uint16 dir) {
 	}
 
 	switch (dir) {
-	case Map::kDirNW:
+	case kDirNW:
 		cx = 1;
 		break;
 
-	case Map::kDirN:
+	case kDirN:
 		cx = 2;
 		break;
 
-	case Map::kDirNE:
+	case kDirNE:
 		cx = 3;
 		break;
 
-	case Map::kDirW:
+	case kDirW:
 		cx = 0;
 		break;
 
-	case Map::kDirE:
+	case kDirE:
 		cx = 4;
 		break;
 
-	case Map::kDirSW:
+	case kDirSW:
 		cx = 7;
 		break;
 
-	case Map::kDirS:
+	case kDirS:
 		cx = 6;
 		break;
 
-	case Map::kDirSE:
+	case kDirSE:
 		cx = 5;
 		break;
 	}