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

[lordhoto at users.sourceforge.net]

Revision: 28298
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28298&view=rev
Author:   lordhoto
Date:     2007-07-29 09:35:15 -0700 (Sun, 29 Jul 2007)

Log Message:
-----------
- fixes some warnings
- enables Kyrandia 2 main menu again

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v2.cpp
    scummvm/trunk/engines/kyra/util.h

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2007-07-29 16:33:11 UTC (rev 28297)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2007-07-29 16:35:15 UTC (rev 28298)
@@ -137,7 +137,7 @@
 }
 
 void KyraEngine_v2::mainMenu() {
-	/*bool running = true;
+	bool running = true;
 
 	while (running && !_quitFlag) {
 		seq_playSequences(kSequenceTitle);
@@ -145,11 +145,11 @@
 		
 		switch (gui_handleMainMenu()) {
 			case 0:
-				_screen->showMouse();*/
+				_screen->showMouse();
 				startup();
 				runLoop();
 				cleanup();
-				/*running = false;
+				running = false;
 				break;
 			case 1:
 				seq_playSequences(kSequenceOverview, kSequenceZanFaun); 
@@ -163,7 +163,7 @@
 				break;
 		}
 		_screen->hideMouse();
-	}*/
+	}
 }
 
 void KyraEngine_v2::startup() {

Modified: scummvm/trunk/engines/kyra/util.h
===================================================================
--- scummvm/trunk/engines/kyra/util.h	2007-07-29 16:33:11 UTC (rev 28297)
+++ scummvm/trunk/engines/kyra/util.h	2007-07-29 16:35:15 UTC (rev 28298)
@@ -32,6 +32,8 @@
 
 template<class Arg, class Res>
 struct Functor1 : public Common::UnaryFunction<Arg, Res> {
+	virtual ~Functor1() {}
+
 	virtual operator bool() const = 0;
 	virtual Res operator()(Arg) const = 0;
 };


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