[Scummvm-cvs-logs] SF.net SVN: scummvm: [32762] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 32762
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32762&view=rev
Author:   peres001
Date:     2008-06-24 06:21:22 -0700 (Tue, 24 Jun 2008)

Log Message:
-----------
Fix for bug #2001193. Character confirmation screen didn't appear and game crashed because too many strings were added to the draw list.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/callables_ns.cpp
    scummvm/trunk/engines/parallaction/gui_ns.cpp
    scummvm/trunk/engines/parallaction/parallaction.h
    scummvm/trunk/engines/parallaction/parallaction_ns.cpp

Modified: scummvm/trunk/engines/parallaction/callables_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/callables_ns.cpp	2008-06-23 05:49:43 UTC (rev 32761)
+++ scummvm/trunk/engines/parallaction/callables_ns.cpp	2008-06-24 13:21:22 UTC (rev 32762)
@@ -417,6 +417,11 @@
 }
 
 void Parallaction_ns::_c_testResult(void *parm) {
+	if (_inTestResult) {
+		return;
+	}
+	_inTestResult = true;
+
 	_gfx->updateScreen();
 
 	_disk->selectArchive("disk1");

Modified: scummvm/trunk/engines/parallaction/gui_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/gui_ns.cpp	2008-06-23 05:49:43 UTC (rev 32761)
+++ scummvm/trunk/engines/parallaction/gui_ns.cpp	2008-06-24 13:21:22 UTC (rev 32762)
@@ -166,6 +166,8 @@
 }
 
 void Parallaction_ns::selectStartLocation() {
+	_inTestResult = false;
+
 	int character = guiSelectCharacter();
 	if (character == -1)
 		error("invalid character selected from menu screen");

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2008-06-23 05:49:43 UTC (rev 32761)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2008-06-24 13:21:22 UTC (rev 32762)
@@ -548,6 +548,9 @@
 	ZonePtr _moveSarcExaZones[5];
 	AnimationPtr _rightHandAnim;
 
+	bool	_inTestResult;
+
+
 	// common callables
 	void _c_play_boogie(void*);
 	void _c_startIntro(void*);

Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2008-06-23 05:49:43 UTC (rev 32761)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2008-06-24 13:21:22 UTC (rev 32762)
@@ -147,6 +147,8 @@
 
 	num_foglie = 0;
 
+	_inTestResult = false;
+
 	_location._animations.push_front(_char._ani);
 
 	Parallaction::init();
@@ -156,7 +158,7 @@
 
 Parallaction_ns::~Parallaction_ns() {
 	freeFonts();
-	
+
 	delete _locationParser;
 	delete _programParser;
 	delete _mouseComposedArrow;
@@ -235,10 +237,10 @@
 	_globalTable = _disk->loadTable("global");
 
 	guiStart();
-	
+
 	if (_engineFlags & kEngineQuit)
 		return 0;
-	
+
 	changeLocation(_location._name);
 
 	if (_engineFlags & kEngineQuit)


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