X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMainLayer.cc;h=85828c7f65dbfee150201d997ee6ffa0754e0b07;hp=4975e17f1b28db30e9df1d95a73469a9f6a85456;hb=a31d65a998121df0651c57bfb68782e2a07d2e2f;hpb=64bd443538f57ad1bdff6c6b35953e72141129b2

diff --git a/src/MainLayer.cc b/src/MainLayer.cc
index 4975e17..85828c7 100644
--- a/src/MainLayer.cc
+++ b/src/MainLayer.cc
@@ -29,6 +29,7 @@
 #include <cstdlib>		// atexit, getenv
 #include <iostream>
 #include <string>
+#include <unistd.h>		// access
 
 #include <Moof/Dispatcher.hh>
 #include <Moof/Exception.hh>
@@ -61,9 +62,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);
@@ -73,7 +74,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());
 }
 
 
@@ -99,17 +100,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;
 
@@ -132,7 +133,7 @@ void MainLayer::quit()
 	// the operating system will take care of cleaning up
 	exit(0);
 #else
-	engine->clear();
+	mEngine->clear();
 #endif
 }
 
@@ -171,7 +172,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
@@ -189,14 +191,39 @@ void printUsage()
 			  << "See documentation for more options." << std::endl;
 }
 
-void printInfo()
+void printInfo(int argc, char* argv[])
 {
-	std::cout << PACKAGE_STRING << std::endl
+	std::string assets;
+	std::string datadir;
+	std::string config;
+
+	assets.assign(YOINK_DATADIR);
+	int accessible = access(assets.c_str(), R_OK);
+	if (accessible != 0) assets += " (no access)";
+
+	char* temp = getenv("YOINK_DATADIR");
+	if (temp)
+	{
+		datadir = temp;
+		accessible = access(temp, R_OK);
+		if (accessible != 0) datadir += " (no access)";
+	}
+
+	temp = getenv("YOINKRC");
+	if (temp)
+	{
+		config = temp;
+		accessible = access(temp, R_OK);
+		if (accessible != 0) config += " (no access)";
+	}
+
+	std::cout << "   Executable: " << argv[0] << std::endl
+			  << "      Version: "VERSION << std::endl
 #ifdef __DATE__
-			  << "When compiled: "__DATE__" "__TIME__ << std::endl
+			  << "        Built: "__DATE__" "__TIME__ << std::endl
 #endif
-			  << "Compiler: "COMPILER_STRING << std::endl
-			  << "Asset directory: "YOINK_DATADIR << std::endl
+			  << "     Compiler: "COMPILER_STRING << std::endl
+			  << "       Assets: " << assets << std::endl
 			  << "Build options: "
 #ifdef NDEBUG
 			  << "-"
@@ -205,15 +232,17 @@ void printInfo()
 #ifndef USE_DOUBLE_PRECISION
 			  << "-"
 #endif
-			  << "double "
+			  << "double-precision "
 #ifndef PROFILING_ENABLED
 			  << "-"
 #endif
 			  << "profile "
-			  << std::endl;
-#if !defined (_WIN32) && !defined(__WIN32__)
-	system("uname -a");
+#ifndef USE_THREADS
+			  << "-"
 #endif
+			  << "threads" << std::endl
+			  << "      YOINKRC: " << config << std::endl
+			  << "YOINK_DATADIR: " << datadir << std::endl;
 }
 
 void goodbye()
@@ -222,6 +251,8 @@ void goodbye()
 }
 
 
+typedef cml::matrix< Mf::Scalar, cml::fixed<5,5>,
+		cml::col_basis, cml::col_major >		Matrix5;
 
 int main(int argc, char* argv[])
 {
@@ -235,7 +266,7 @@ int main(int argc, char* argv[])
 		}
 		else if (arg == "-i" || arg == "--info")
 		{
-			printInfo();
+			printInfo(argc, argv);
 			return 0;
 		}
 	}