From 206d167457efe684478a7947535a9c58b790e31d Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 30 Jun 2007 16:25:59 +0000
Subject: AGOS: Introduced ChildType enum

svn-id: r27792
---
 engines/agos/contain.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'engines/agos/contain.cpp')

diff --git a/engines/agos/contain.cpp b/engines/agos/contain.cpp
index b5ca344905..891ac36d30 100644
--- a/engines/agos/contain.cpp
+++ b/engines/agos/contain.cpp
@@ -34,8 +34,8 @@ int AGOSEngine::canPlace(Item *x, Item *y) {
 	Item *z = derefItem(x->parent);
 
 	if (getGameType() == GType_ELVIRA1) {
-		SubPlayer *p = (SubPlayer *)findChildOfType(y, 3);
-		SubContainer *c = (SubContainer *)findChildOfType(y, 7);
+		SubPlayer *p = (SubPlayer *)findChildOfType(y, kPlayerType);
+		SubContainer *c = (SubContainer *)findChildOfType(y, kContainerType);
 		int cap = 0;
 		int wt;
 
@@ -59,7 +59,7 @@ int AGOSEngine::canPlace(Item *x, Item *y) {
 				return -2;	/* Too heavy */
 		}
 	} else {
-		SubObject *o = (SubObject *)findChildOfType(y, 2);
+		SubObject *o = (SubObject *)findChildOfType(y, kObjectType);
 		int ct;
 		int cap = 0;
 
@@ -120,11 +120,11 @@ int AGOSEngine::sizeRec(Item *x, int d) {
 }
 
 int AGOSEngine::sizeOfRec(Item *i, int d) {
-	SubObject *o = (SubObject *)findChildOfType(i, 2);
+	SubObject *o = (SubObject *)findChildOfType(i, kObjectType);
 
 	if (getGameType() == GType_ELVIRA1) {
-		SubPlayer *p = (SubPlayer *)findChildOfType(i, 3);
-		SubContainer *c = (SubContainer *)findChildOfType(i, 7);
+		SubPlayer *p = (SubPlayer *)findChildOfType(i, kPlayerType);
+		SubContainer *c = (SubContainer *)findChildOfType(i, kContainerType);
 
 		if ((c) && (c->flags & 1)) {
 			if (o)
@@ -174,10 +174,10 @@ int AGOSEngine::weightRec(Item *x, int d) {
 }
 
 int AGOSEngine::weightOf(Item *x) {
-	SubObject *o = (SubObject *)findChildOfType(x, 2);
+	SubObject *o = (SubObject *)findChildOfType(x, kObjectType);
 
 	if (getGameType() == GType_ELVIRA1) {
-		SubPlayer *p = (SubPlayer *)findChildOfType(x, 3);
+		SubPlayer *p = (SubPlayer *)findChildOfType(x, kPlayerType);
 		if (o)
 			return o->objectWeight;
 		if (p)
-- 
cgit v1.2.3