[Scummvm-cvs-logs] SF.net SVN: scummvm: [31767] scummvm/trunk/engines/kyra

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Apr 28 23:32:23 CEST 2008


Revision: 31767
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31767&view=rev
Author:   lordhoto
Date:     2008-04-28 14:32:23 -0700 (Mon, 28 Apr 2008)

Log Message:
-----------
- Implemented credits showing after finishing game
- Fixed bug with good conscience displaying in conscience selection scene

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v3.cpp
    scummvm/trunk/engines/kyra/kyra_v3.h
    scummvm/trunk/engines/kyra/saveload_v3.cpp
    scummvm/trunk/engines/kyra/scene_v3.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.cpp	2008-04-28 20:45:22 UTC (rev 31766)
+++ scummvm/trunk/engines/kyra/kyra_v3.cpp	2008-04-28 21:32:23 UTC (rev 31767)
@@ -139,6 +139,7 @@
 	_goodConscienceShown = false;
 	_goodConscienceAnim = -1;
 	_goodConsciencePosition = false;
+	_showOutro = false;
 }
 
 KyraEngine_v3::~KyraEngine_v3() {
@@ -298,6 +299,9 @@
 		}
 	}
 
+	if (_showOutro)
+		playVQA("CREDITS");
+
 	return 0;
 }
 

Modified: scummvm/trunk/engines/kyra/kyra_v3.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-28 20:45:22 UTC (rev 31766)
+++ scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-28 21:32:23 UTC (rev 31767)
@@ -74,6 +74,7 @@
 	void setupOpcodeTable();
 
 	// run
+	bool _showOutro;
 	bool _runFlag;
 	int _deathHandler;
 

Modified: scummvm/trunk/engines/kyra/saveload_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_v3.cpp	2008-04-28 20:45:22 UTC (rev 31766)
+++ scummvm/trunk/engines/kyra/saveload_v3.cpp	2008-04-28 21:32:23 UTC (rev 31767)
@@ -235,8 +235,8 @@
 	_mainCharacter.facing = 4;
 	_badConscienceShown = false;
 	_badConsciencePosition = false;
-	//_goodConscienceShown = false;
-	//_goodConsciencePosition = false;
+	_goodConscienceShown = false;
+	_goodConsciencePosition = false;
 	
 	enterNewScene(_mainCharacter.sceneId, _mainCharacter.facing, 0, 0, 1);
 	setHandItem(_itemInHand);

Modified: scummvm/trunk/engines/kyra/scene_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_v3.cpp	2008-04-28 20:45:22 UTC (rev 31766)
+++ scummvm/trunk/engines/kyra/scene_v3.cpp	2008-04-28 21:32:23 UTC (rev 31767)
@@ -171,6 +171,7 @@
 	_sceneScriptState.regs[3] = 1;
 	enterNewSceneUnk2(unk3);
 	if (queryGameFlag(0)) {
+		_showOutro = true;
 		_runFlag = false;
 	} else {
 		if (!--_enterNewSceneLock)


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




More information about the Scummvm-git-logs mailing list