[Scummvm-cvs-logs] SF.net SVN: scummvm:[40158] scummvm/trunk/engines/tinsel

[dreammaster at users.sourceforge.net]

Revision: 40158
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40158&view=rev
Author:   dreammaster
Date:     2009-04-27 12:21:14 +0000 (Mon, 27 Apr 2009)

Log Message:
-----------
Fixed a method name clash, and changed the Restart dialog to properly use the renamed method, rather than just setting the global variable directly

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/dialogs.cpp
    scummvm/trunk/engines/tinsel/tinlib.cpp
    scummvm/trunk/engines/tinsel/tinlib.h

Modified: scummvm/trunk/engines/tinsel/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/dialogs.cpp	2009-04-27 12:19:21 UTC (rev 40157)
+++ scummvm/trunk/engines/tinsel/dialogs.cpp	2009-04-27 12:21:14 UTC (rev 40158)
@@ -4199,7 +4199,7 @@
 					break;
 				case INITGAME:
 					KillInventory();
-					bRestart = true;
+					FnRestartGame();
 					break;
 				case CLANG:
 					if (!LanguageChange())

Modified: scummvm/trunk/engines/tinsel/tinlib.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinlib.cpp	2009-04-27 12:19:21 UTC (rev 40157)
+++ scummvm/trunk/engines/tinsel/tinlib.cpp	2009-04-27 12:21:14 UTC (rev 40158)
@@ -2400,9 +2400,9 @@
 }
 
 /**
- * restartgame
+ * FnRestartGame
  */
-static void RestartGame(void) {
+void FnRestartGame(void) {
 	// TODO: Tinsel 2 comments out the 2 calls, but I'm not sure that this should be done
 	StopMidi();
 	StopSample();
@@ -5040,7 +5040,7 @@
 
 	case RESTARTGAME:
 		// Common to both DW1 & DW2
-		RestartGame();
+		FnRestartGame();
 		return 0;
 
 	case RESTORESCENE:

Modified: scummvm/trunk/engines/tinsel/tinlib.h
===================================================================
--- scummvm/trunk/engines/tinsel/tinlib.h	2009-04-27 12:19:21 UTC (rev 40157)
+++ scummvm/trunk/engines/tinsel/tinlib.h	2009-04-27 12:21:14 UTC (rev 40158)
@@ -53,6 +53,7 @@
 void HookScene(SCNHANDLE scene, int entrance, int transition);
 void NewScene(CORO_PARAM, SCNHANDLE scene, int entrance, int transition);
 void Offset(EXTREME extreme, int x, int y);
+void FnRestartGame(void);
 void RestoreScene(void);
 void ResumeLastGame(void);
 void SaveScene(CORO_PARAM);


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