[Csp-commits] svn:csp r1825 - in trunk/CSP/csp/cspsim: . views

[<sv...@ww...>]

Author: mkrose
Date: 2006-01-21 19:05:27 -0800 (Sat, 21 Jan 2006)
New Revision: 1825

Modified:
   trunk/CSP/csp/cspsim/EventMapIndex.cpp
   trunk/CSP/csp/cspsim/GameScreen.cpp
   trunk/CSP/csp/cspsim/views/ExternalViews.cpp
Log:
Minor cleanups.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1825

Modified: trunk/CSP/csp/cspsim/EventMapIndex.cpp
===================================================================
--- trunk/CSP/csp/cspsim/EventMapIndex.cpp	2006-01-22 03:01:34 UTC (rev 1824)
+++ trunk/CSP/csp/cspsim/EventMapIndex.cpp	2006-01-22 03:05:27 UTC (rev 1825)
@@ -64,11 +64,11 @@
 	std::string path = getConfigPath("InputMapPath");
 	CSPLOG(INFO, APP) << "Looking for human interface device mappings in '" << path << "'";
 	ospath::DirectoryContents dc = ospath::getDirectoryContents(path);
-	CSPLOG(INFO, APP) << "Found " << dc.size() << " files";
 	for (ospath::DirectoryContents::const_iterator file = dc.begin(); file != dc.end(); ++file) {
 		std::string fn = ospath::join(path, *file);
-		CSPLOG(INFO, APP) << "File: " << *file << ", " << fn << ", " << ospath::getFileExtension(fn);
-		if (ospath::getFileExtension(fn) == "hid") load(fn);
+		if (ospath::getFileExtension(fn) == "hid") {
+			load(fn);
+		}
 	}
 }
 

Modified: trunk/CSP/csp/cspsim/GameScreen.cpp
===================================================================
--- trunk/CSP/csp/cspsim/GameScreen.cpp	2006-01-22 03:01:34 UTC (rev 1824)
+++ trunk/CSP/csp/cspsim/GameScreen.cpp	2006-01-22 03:05:27 UTC (rev 1825)
@@ -286,13 +286,11 @@
 void GameScreen::on_View0() {
 }
 
-void GameScreen::on_Quit()
-{
+void GameScreen::on_Quit() {
 	CSPSim::theSim->quit();
 }
 
-void GameScreen::on_Pause()
-{
+void GameScreen::on_Pause() {
 	CSPSim::theSim->togglePause();
 	m_ScreenInfoManager->setStatus("PAUSE", !m_ScreenInfoManager->getStatus("PAUSE"));
 }

Modified: trunk/CSP/csp/cspsim/views/ExternalViews.cpp
===================================================================
--- trunk/CSP/csp/cspsim/views/ExternalViews.cpp	2006-01-22 03:01:34 UTC (rev 1824)
+++ trunk/CSP/csp/cspsim/views/ExternalViews.cpp	2006-01-22 03:05:27 UTC (rev 1825)
@@ -29,8 +29,6 @@
 
 #include <csp/cspsim/CSPSim.h>
 #include <csp/cspsim/DynamicObject.h>
-// FIXME: why ObjetModel class definition is needed here (vc++ error)
-#include <csp/cspsim/ObjectModel.h>
 
 #include <csp/csplib/util/Noise.h>