Ticket #5916: agi-fix-debug.patch

engines/agi/checks.cpp

@@ -25 +25 @@
 namespace Agi {
 
 int AgiEngine::checkPosition(VtEntry *v) {
+        debug(1, "AgiEngine::checkPosition(v) v->xPos:%d v->yPos:%d v->xSize:%d v->ySize:%d", v->xPos, v->yPos, v->xSize, v->ySize);
+        debug(1, "\t _WIDTH:%d _HEIGHT:%d (~v->flags & fIgnoreHorizon):%d _game.horizon:%d", _WIDTH, _HEIGHT, (~v->flags & fIgnoreHorizon), _game.horizon);
         debugC(4, kDebugLevelSprites, "check position @ %d, %d", v->xPos, v->yPos);
 
         if (v->xPos < 0 ||
@@ -34 +36 @@
                         ((~v->flags & fIgnoreHorizon) && v->yPos <= _game.horizon)) {
                 debugC(4, kDebugLevelSprites, "check position failed: x=%d, y=%d, h=%d, w=%d",
                                 v->xPos, v->yPos, v->xSize, v->ySize);
+                debug(1, "\treturn #1 0");
                 return 0;
         }
 
         // MH1 needs this, but it breaks LSL1
         if (getVersion() >= 0x3000) {
-                if (v->yPos < v->ySize)
+                if (v->yPos < v->ySize) {
+                        debug(1, "\treturn #2 0");
                         return 0;
+                }
         }
 
+        debug(1, "\treturn #3 1");
         return 1;
 }
 
@@ -50 +56 @@
  * Check if there's another object on the way
  */
 int AgiEngine::checkCollision(VtEntry *v) {
+        debug(1, "AgiEngine::checkCollision(v)");
         VtEntry *u;
 
-        if (v->flags & fIgnoreObjects)
+        if (v->flags & fIgnoreObjects) {
+                debug(1, "\treturn #1 0");
                 return 0;
+        }
 
         for (u = _game.viewTable; u < &_game.viewTable[MAX_VIEWTABLE]; u++) {
                 if ((u->flags & (fAnimated | fDrawn)) != (fAnimated | fDrawn))
@@ -73 +82 @@
                 // Same y, return error!
                 if (v->yPos == u->yPos) {
                         debugC(4, kDebugLevelSprites, "check returns 1 (object %d)", v->entry);
+                        debug(1, "\treturn #2 1");
                         return 1;
                 }
 
@@ -80 +90 @@
                 if ((v->yPos > u->yPos && v->yPos2 < u->yPos2) ||
                                 (v->yPos < u->yPos && v->yPos2 > u->yPos2)) {
                         debugC(4, kDebugLevelSprites, "check returns 1 (object %d)", v->entry);
+                        debug(1, "\treturn #3 1");
                         return 1;
                 }
         }
 
+        debug(1, "\treturn #4 0");
         return 0;
 
 }
 
 int AgiEngine::checkPriority(VtEntry *v) {
+        debug(1, "AgiEngine::checkPriority(v)");
         int i, trigger, water, pass, pri;
         uint8 *p0;
 
@@ -108 +121 @@
                         setflag(fEgoWater, water ? true : false);
                 }
 
+                debug(1, "\treturn #1 pass: %d", pass);
                 return pass;
         }
 
@@ -157 +171 @@
                 setflag(fEgoWater, water ? true : false);
         }
 
+        debug(1, "\treturn #2 pass: %d", pass);
         return pass;
 }
 
@@ -271 +286 @@
  */
 void AgiEngine::fixPosition(int n) {
         VtEntry *v = &_game.viewTable[n];
-        int count, dir, size;
+        debug(1, "AgiEngine::fixPosition(n: %d) adjusting view table entry #%d (%d,%d)", n, n, v->xPos, v->yPos);
+        int dir, count, size;
 
         debugC(4, kDebugLevelSprites, "adjusting view table entry #%d (%d,%d)", n, v->xPos, v->yPos);
 
@@ -282 +298 @@
         dir = 0;
         count = size = 1;
 
-        while (!checkPosition(v) || checkCollision(v) || !checkPriority(v)) {
+        while (shouldQuit() && (!checkPosition(v) || checkCollision(v) || !checkPriority(v))) {
                 switch (dir) {
                 case 0: // west
                         v->xPos--;
-                        if (--count)
+                        if (count && --count)
                                 continue;
                         dir = 1;
                         break;
                 case 1: // south
                         v->yPos++;
-                        if (--count)
+                        if (count && --count)
                                 continue;
                         dir = 2;
                         size++;
                         break;
                 case 2: // east
                         v->xPos++;
-                        if (--count)
+                        if (count && --count)
                                 continue;
                         dir = 3;
                         break;
                 case 3: // north
                         v->yPos--;
-                        if (--count)
+                        if (count && --count)
                                 continue;
                         dir = 0;
                         size++;