[Scummvm-cvs-logs] SF.net SVN: scummvm: [28210] scummvm/branches/branch-0-10-0/engines/ parallaction

[Kirben at users.sourceforge.net]

Revision: 28210
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28210&view=rev
Author:   Kirben
Date:     2007-07-26 00:20:52 -0700 (Thu, 26 Jul 2007)

Log Message:
-----------
Fix compile.

Modified Paths:
--------------
    scummvm/branches/branch-0-10-0/engines/parallaction/detection.cpp
    scummvm/branches/branch-0-10-0/engines/parallaction/dialogue.cpp
    scummvm/branches/branch-0-10-0/engines/parallaction/graphics.h
    scummvm/branches/branch-0-10-0/engines/parallaction/parallaction.cpp

Modified: scummvm/branches/branch-0-10-0/engines/parallaction/detection.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/parallaction/detection.cpp	2007-07-26 03:29:45 UTC (rev 28209)
+++ scummvm/branches/branch-0-10-0/engines/parallaction/detection.cpp	2007-07-26 07:20:52 UTC (rev 28210)
@@ -174,9 +174,7 @@
 namespace Parallaction {
 
 bool Parallaction::detectGame() {
-	Common::EncapsulatedADGameDesc encapsulatedDesc = Common::AdvancedDetector::detectBestMatchingGame(detectionParams);
-	_gameDescription = (const PARALLACTIONGameDescription *)(encapsulatedDesc.realDesc);
-
+	_gameDescription = (const PARALLACTIONGameDescription *)Common::AdvancedDetector::detectBestMatchingGame(detectionParams);
 	return (_gameDescription != 0);
 }
 

Modified: scummvm/branches/branch-0-10-0/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/parallaction/dialogue.cpp	2007-07-26 03:29:45 UTC (rev 28209)
+++ scummvm/branches/branch-0-10-0/engines/parallaction/dialogue.cpp	2007-07-26 07:20:52 UTC (rev 28210)
@@ -253,7 +253,7 @@
 		_vm->_gfx->updateScreen();
 
 		Common::Event e;
-		while (e.kbd.ascii != Common::KEYCODE_RETURN && passwordLen < MAX_PASSWORD_LENGTH) {
+		while (e.kbd.ascii != 0xD && passwordLen < MAX_PASSWORD_LENGTH) {
 
 			// FIXME: see comment for updateInput()
 			if (!g_system->getEventManager()->pollEvent(e)) continue;

Modified: scummvm/branches/branch-0-10-0/engines/parallaction/graphics.h
===================================================================
--- scummvm/branches/branch-0-10-0/engines/parallaction/graphics.h	2007-07-26 03:29:45 UTC (rev 28209)
+++ scummvm/branches/branch-0-10-0/engines/parallaction/graphics.h	2007-07-26 07:20:52 UTC (rev 28210)
@@ -73,7 +73,7 @@
 	byte	_first;
 	byte	_last;
 
-} PACKED_STRUCT;
+};
 
 #include "common/pack-end.h"	// END STRUCT PACKING
 

Modified: scummvm/branches/branch-0-10-0/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/parallaction/parallaction.cpp	2007-07-26 03:29:45 UTC (rev 28209)
+++ scummvm/branches/branch-0-10-0/engines/parallaction/parallaction.cpp	2007-07-26 07:20:52 UTC (rev 28210)
@@ -286,8 +286,8 @@
 			if (e.kbd.flags == Common::KBD_CTRL && e.kbd.keycode == 'd')
 				_debugger->attach();
 			if (getFeatures() & GF_DEMO) break;
-			if (e.kbd.keycode == Common::KEYCODE_l) KeyDown = kEvLoadGame;
-			if (e.kbd.keycode == Common::KEYCODE_s) KeyDown = kEvSaveGame;
+			if (e.kbd.ascii == 'l') KeyDown = kEvLoadGame;
+			if (e.kbd.ascii == 's') KeyDown = kEvSaveGame;
 			break;
 
 		case Common::EVENT_LBUTTONDOWN:


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