X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMainLayer.cc;h=6a426fb8f41c89cfba117571a945a554854fffb9;hp=2e687855dd73d03a557bcf2108d9940d1706ed4c;hb=c9e20ac06383b20ceb5404c9237e319c2e90d157;hpb=31d52677b38d935297d132bdbd956c655cd3feee

diff --git a/src/MainLayer.cc b/src/MainLayer.cc
index 2e68785..6a426fb 100644
--- a/src/MainLayer.cc
+++ b/src/MainLayer.cc
@@ -34,6 +34,7 @@
 #include <Moof/Dispatcher.hh>
 #include <Moof/Exception.hh>
 #include <Moof/Log.hh>
+#include <Moof/ModalDialog.hh>
 #include <Moof/OpenGL.hh>
 #include <Moof/Resource.hh>
 #include <Moof/Transition.hh>
@@ -62,9 +63,9 @@ MainLayer::~MainLayer()
 }
 
 
-void MainLayer::pushed(Mf::Engine& e)
+void MainLayer::pushed(Mf::Engine& engine)
 {
-	engine = &e;
+	mEngine = &engine;
 
 	//Mf::Scalar coeff[] = {0.0, 1.0};
 	//Mf::Lerp interp(coeff, 0.25);
@@ -74,7 +75,7 @@ void MainLayer::pushed(Mf::Engine& e)
 		//Mf::Transition<Mf::Lerp>::alloc(gameLayer, Mf::LayerP(), interp);
 	//engine->push(transition);
 	//engine->push(GameLayer::alloc());
-	engine->push(TitleLayer::alloc());
+	mEngine->push(TitleLayer::alloc());
 }
 
 
@@ -100,17 +101,17 @@ bool MainLayer::handleEvent(const Mf::Event& event)
 			}
 			else if (event.key.keysym.sym == SDLK_f)
 			{
-				engine->getVideo().toggleFull();
+				mEngine->getVideo().toggleFull();
 			}
 			else if (event.key.keysym.sym == SDLK_l)
 			{
-				Mf::Video& video = engine->getVideo();
+				Mf::Video& video = mEngine->getVideo();
 				video.toggleCursorGrab();
 				video.toggleCursorVisible();
 			}
 			else if (event.key.keysym.sym == SDLK_y)
 			{
-				engine->push(GameLayer::alloc());
+				mEngine->push(GameLayer::alloc());
 			}
 			break;
 
@@ -128,13 +129,8 @@ bool MainLayer::handleEvent(const Mf::Event& event)
 
 void MainLayer::quit()
 {
-#if NDEBUG
-	// we don't really need to unwind the stack and shut everything down because
-	// the operating system will take care of cleaning up
-	exit(0);
-#else
-	engine->clear();
-#endif
+	// remove all the layers
+	mEngine->clear();
 }
 
 
@@ -172,7 +168,8 @@ void MainLayer::contextRecreated(const Mf::Notification* note)
 
 void printUsage()
 {
-	std::cout << "Usage: "PACKAGE" [-h|--help] [-i|--info] [OPTION=VALUE]..." << std::endl
+	std::cout << "Usage: "PACKAGE" [-h|--help] [-i|--info] [OPTION=VALUE]..."
+			  << std::endl
 			  << "The alien-smashing action game." << std::endl
 			  << std::endl
 			  << "Options:" << std::endl
@@ -218,7 +215,7 @@ void printInfo(int argc, char* argv[])
 
 	std::cout << "   Executable: " << argv[0] << std::endl
 			  << "      Version: "VERSION << std::endl
-#ifdef __DATE__
+#if defined(__DATE__) && defined(__TIME__)
 			  << "        Built: "__DATE__" "__TIME__ << std::endl
 #endif
 			  << "     Compiler: "COMPILER_STRING << std::endl
@@ -232,10 +229,18 @@ void printInfo(int argc, char* argv[])
 			  << "-"
 #endif
 			  << "double-precision "
+#ifndef USE_GTK
+			  << "-"
+#endif
+			  << "gtk "
 #ifndef PROFILING_ENABLED
 			  << "-"
 #endif
 			  << "profile "
+#ifndef USE_QT4
+			  << "-"
+#endif
+			  << "qt4 "
 #ifndef USE_THREADS
 			  << "-"
 #endif
@@ -250,7 +255,6 @@ void goodbye()
 }
 
 
-
 int main(int argc, char* argv[])
 {
 	if (argc > 1)
@@ -301,7 +305,7 @@ int main(int argc, char* argv[])
 
 	Mf::Resource::addSearchPath(YOINK_DATADIR);
 
-	std::string iconFile = Mf::Resource::getPath("yoink.png");
+	std::string iconFile = Mf::Resource::getPath(PACKAGE".png");
 
 
 	// Build the list of config files to search for, in this order:
@@ -322,7 +326,6 @@ int main(int argc, char* argv[])
 		configFiles += configFile;
 	}
 
-
 	try
 	{
 		Mf::Engine app(argc, argv, PACKAGE_STRING, iconFile, configFiles);
@@ -330,11 +333,19 @@ int main(int argc, char* argv[])
 
 		app.run();
 	}
-	catch (Mf::Exception e)
+	catch (const Mf::Exception& e)
 	{
-		Mf::logError("unhandled exception: <<%s>>", e.what());
-		Mf::logInfo("it's time to crash now :-(");
-		throw e;
+		Mf::logError("unhandled exception (code %d): \"%s\"",
+				e.code(), e.what());
+
+		Mf::ModalDialog dialog;
+		dialog.title = PACKAGE_STRING;
+		dialog.text1 = "Unhandled Exception";
+		dialog.text2 = e.what();
+		dialog.type = Mf::ModalDialog::CRITICAL;
+		dialog.run();
+
+		return 1;
 	}
 
 	return 0;