[Scummvm-cvs-logs] SF.net SVN: scummvm:[52485] scummvm/trunk

[strangerke at users.sourceforge.net]

Revision: 52485
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52485&view=rev
Author:   strangerke
Date:     2010-09-01 22:11:01 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
HUGO: Fix labyrinth bug in Hugo 2 for Windows

Modified Paths:
--------------
    scummvm/trunk/engines/hugo/engine.cpp
    scummvm/trunk/engines/hugo/hugo.cpp
    scummvm/trunk/engines/hugo/hugo.h
    scummvm/trunk/tools/create_hugo/create_hugo.cpp
    scummvm/trunk/tools/create_hugo/create_hugo.h

Modified: scummvm/trunk/engines/hugo/engine.cpp
===================================================================
--- scummvm/trunk/engines/hugo/engine.cpp	2010-09-01 19:20:17 UTC (rev 52484)
+++ scummvm/trunk/engines/hugo/engine.cpp	2010-09-01 22:11:01 UTC (rev 52485)
@@ -523,9 +523,6 @@
 
 	debugC(1, kDebugEngine, "processMaze");
 
-	//actlist     alnewscr  = {&aheroxy,&astophero,&aherostop,&anewscr,NULL};
-	//actlist_pt  alist     = &alnewscr[0];
-
 	currImage = _hero->currImagePtr;                // Get ptr to current image
 	x1 = _hero->x + currImage->x1;                  // Left edge of object
 	x2 = _hero->x + currImage->x2;                  // Right edge
@@ -534,41 +531,29 @@
 
 	if (x1 < _maze.x1) {
 		// Exit west
-//		anewscr.screen = *_screen_p - 1;
 		_actListArr[_alNewscrIndex][3].a8.screenIndex = *_screen_p - 1;
-//		aheroxy.x = _maze.x2 - SHIFT - (x2 - x1);
 		_actListArr[_alNewscrIndex][0].a2.x = _maze.x2 - SHIFT - (x2 - x1);
-//		aheroxy.y = _hero_p->y;
 		_actListArr[_alNewscrIndex][0].a2.y = _hero->y;
 		_status.routeIndex = -1;
 		scheduler().insertActionList(_alNewscrIndex);
 	} else if (x2 > _maze.x2) {
 		// Exit east
-//			anewscr.screen = *_screen_p + 1;
 		_actListArr[_alNewscrIndex][3].a8.screenIndex = *_screen_p + 1;
-//			aheroxy.x = _maze.x1 + SHIFT;
 		_actListArr[_alNewscrIndex][0].a2.x = _maze.x1 + SHIFT;
-//			aheroxy.y = _hero_p->y;
 		_actListArr[_alNewscrIndex][0].a2.y = _hero->y;
 		_status.routeIndex = -1;
 		scheduler().insertActionList(_alNewscrIndex);
 	} else if (y1 < _maze.y1 - SHIFT) {
 		// Exit north
-//				anewscr.screen = *_screen_p - _maze.size;
 		_actListArr[_alNewscrIndex][3].a8.screenIndex = *_screen_p - _maze.size;
-//				aheroxy.x = _maze.x3;             // special offset for perspective
 		_actListArr[_alNewscrIndex][0].a2.x = _maze.x3;
-//				aheroxy.y = _maze.y2 - SHIFT - (y2 - y1);
 		_actListArr[_alNewscrIndex][0].a2.y = _maze.y2 - SHIFT - (y2 - y1);
 		_status.routeIndex = -1;
 		scheduler().insertActionList(_alNewscrIndex);
 	} else if (y2 > _maze.y2 - SHIFT / 2) {
 		// Exit south
-//					anewscr.screen = *_screen_p + _maze.size;
 		_actListArr[_alNewscrIndex][3].a8.screenIndex = *_screen_p + _maze.size;
-//					aheroxy.x = _maze.x4;            // special offset for perspective
 		_actListArr[_alNewscrIndex][0].a2.x = _maze.x4;
-//					aheroxy.y = _maze.y1 + SHIFT;
 		_actListArr[_alNewscrIndex][0].a2.y = _maze.y1 + SHIFT;
 		_status.routeIndex = -1;
 		scheduler().insertActionList(_alNewscrIndex);

Modified: scummvm/trunk/engines/hugo/hugo.cpp
===================================================================
--- scummvm/trunk/engines/hugo/hugo.cpp	2010-09-01 19:20:17 UTC (rev 52484)
+++ scummvm/trunk/engines/hugo/hugo.cpp	2010-09-01 22:11:01 UTC (rev 52485)
@@ -848,6 +848,7 @@
 					case INIT_MAZE:          // 30
 						_actListArr[i][j].a30.timer = in.readSint16BE();
 						_actListArr[i][j].a30.mazeSize = in.readByte();
+						_actListArr[i][j].a30.x1 = in.readSint16BE();
 						_actListArr[i][j].a30.y1 = in.readSint16BE();
 						_actListArr[i][j].a30.x2 = in.readSint16BE();
 						_actListArr[i][j].a30.y2 = in.readSint16BE();
@@ -1130,6 +1131,7 @@
 						in.readSint16BE();
 						in.readSint16BE();
 						in.readSint16BE();
+						in.readSint16BE();
 						in.readByte();
 						break;
 					case EXIT_MAZE:          // 31

Modified: scummvm/trunk/engines/hugo/hugo.h
===================================================================
--- scummvm/trunk/engines/hugo/hugo.h	2010-09-01 19:20:17 UTC (rev 52484)
+++ scummvm/trunk/engines/hugo/hugo.h	2010-09-01 22:11:01 UTC (rev 52485)
@@ -33,7 +33,7 @@
 #include "hugo/game.h"
 
 #define HUGO_DAT_VER_MAJ 0  // 1 byte
-#define HUGO_DAT_VER_MIN 18 // 1 byte
+#define HUGO_DAT_VER_MIN 19 // 1 byte
 #define DATAALIGNMENT 4
 
 namespace Common {

Modified: scummvm/trunk/tools/create_hugo/create_hugo.cpp
===================================================================
--- scummvm/trunk/tools/create_hugo/create_hugo.cpp	2010-09-01 19:20:17 UTC (rev 52484)
+++ scummvm/trunk/tools/create_hugo/create_hugo.cpp	2010-09-01 22:11:01 UTC (rev 52485)
@@ -1154,6 +1154,7 @@
 			case INIT_MAZE:          // 30
 				writeSint16BE(outFile, ((act *) actListArr[i][j])->a30.timer);
 				writeByte(outFile, ((act *) actListArr[i][j])->a30.mazeSize);
+				writeSint16BE(outFile, ((act *) actListArr[i][j])->a30.x1);
 				writeSint16BE(outFile, ((act *) actListArr[i][j])->a30.y1);
 				writeSint16BE(outFile, ((act *) actListArr[i][j])->a30.x2);
 				writeSint16BE(outFile, ((act *) actListArr[i][j])->a30.y2);

Modified: scummvm/trunk/tools/create_hugo/create_hugo.h
===================================================================
--- scummvm/trunk/tools/create_hugo/create_hugo.h	2010-09-01 19:20:17 UTC (rev 52484)
+++ scummvm/trunk/tools/create_hugo/create_hugo.h	2010-09-01 22:11:01 UTC (rev 52485)
@@ -31,7 +31,7 @@
 #define DATAALIGNMENT 4
 
 #define HUGO_DAT_VER_MAJ 0  // 1 byte
-#define HUGO_DAT_VER_MIN 18 // 1 byte
+#define HUGO_DAT_VER_MIN 19 // 1 byte
 
 typedef unsigned char  uint8;
 typedef unsigned char  byte;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.