Changed the way games are detected. Now the detection is done out of the scumm object. We can now create de good scumm object depending of the game detected. Warning: the implementation is not yet finalised and the in game gui is more broken than ever....

svn-id: r3802

1 files changed, 5 insertions, 5 deletions

diff --git a/object.cpp b/object.cpp
index 7c3ec7cd5c..e6e439db23 100644
--- a/object.cpp
+++ b/object.cpp
@@ -135,9 +135,9 @@ void Scumm::getObjectXYPos(int object) {
 	ImageHeader *imhd;
 	int x,y;
 	
-        if(!(_features & GF_SMALL_HEADER)) {
-                if (_features&GF_AFTER_V6) {
-                        state = getState(object)-1;
+	if(!(_features & GF_SMALL_HEADER)) {
+		if (_features&GF_AFTER_V6) {
+			state = getState(object)-1;
                         if (state<0)
                                 state = 0;
 
@@ -159,14 +159,14 @@ void Scumm::getObjectXYPos(int object) {
 			}
                 } else {
                         x = od->walk_x;
-						y = od->walk_y;
+			y = od->walk_y;
                 }
 		_xPos = x;
 		_yPos = y;
 		_dir = oldDirToNewDir(od->actordir&3);
         } else {
                 x = od->walk_x;
-				y = od->walk_y;
+		y = od->walk_y;
                 _xPos = x;
                 _yPos = y;
 		_dir= oldDirToNewDir(od->actordir&3);