[Scummvm-cvs-logs] SF.net SVN: scummvm:[51462] scummvm/trunk/engines/m4

[dreammaster at users.sourceforge.net]

Revision: 51462
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51462&view=rev
Author:   dreammaster
Date:     2010-07-29 11:41:51 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
M4: Added further code fragments to enable player to move again

Modified Paths:
--------------
    scummvm/trunk/engines/m4/hotspot.cpp
    scummvm/trunk/engines/m4/mads_scene.cpp
    scummvm/trunk/engines/m4/mads_views.cpp

Modified: scummvm/trunk/engines/m4/hotspot.cpp
===================================================================
--- scummvm/trunk/engines/m4/hotspot.cpp	2010-07-29 11:04:54 UTC (rev 51461)
+++ scummvm/trunk/engines/m4/hotspot.cpp	2010-07-29 11:41:51 UTC (rev 51462)
@@ -185,9 +185,9 @@
 
 uint32 HotSpotList::readHotSpotInteger(Common::SeekableReadStream* hotspotStream) {
 	if (_vm->isM4())
-		return hotspotStream->readUint32LE();
+		return hotspotStream->readSint32LE();
 	else
-		return hotspotStream->readUint16LE();
+		return hotspotStream->readSint16LE();
 }
 
 void HotSpotList::loadHotSpots(Common::SeekableReadStream* hotspotStream, int hotspotCount) {
@@ -196,7 +196,7 @@
 	char buffer[256];
 	uint32 strLength = 0;
 	uint32 index = 0;
-	uint32 feetX, feetY;
+	int feetX, feetY;
 	int cursorOffset = (_vm ->isM4()) ? 0 : 1;
 
 	for (int i = 0; i < hotspotCount; i++) {

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-07-29 11:04:54 UTC (rev 51461)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-07-29 11:41:51 UTC (rev 51462)
@@ -243,8 +243,10 @@
 	if (currentHotSpot != NULL) {
 		_vm->_mouse->setCursorNum(currentHotSpot->getCursor());
 
+		_action._selectedRow = -1;
+		_action._actionMode = ACTMODE_NONE;
+		_action._actionMode2 = ACTMODE2_4;
 		_action._hotspotId = currentHotSpot->getIndex();
-	
 
 	} else {
 		_vm->_mouse->setCursorNum(0);

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-07-29 11:04:54 UTC (rev 51461)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-07-29 11:41:51 UTC (rev 51462)
@@ -299,8 +299,8 @@
 				_madsVm->scene()->_destPos.y = hs.getFeetY();
 			}
 			_madsVm->scene()->_destFacing = hs.getFacing();
+			hotspotId = -1;
 		}
-		hotspotId = -1;
 	}
 
 	if (hotspotId >= 0) {


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