[Csp-commits] svn:csp r2063 - in trunk/csp: cspsim/wf cspsim/windows dist/win/demo

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

Author: nsmoooose
Date: 2007-03-12 12:33:53 -0700 (Mon, 12 Mar 2007)
New Revision: 2063

Modified:
   trunk/csp/cspsim/wf/Serialization.cpp
   trunk/csp/cspsim/windows/MainMenu.cpp
   trunk/csp/dist/win/demo/makedemo.py
Log:
Fixed some issues. 
 * Misspelled include. Build broken on linux.
 * Compiler warnings on linux.
 * Fixed path to readme file used by the python script to make the demo.

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

Modified: trunk/csp/cspsim/wf/Serialization.cpp
===================================================================
--- trunk/csp/cspsim/wf/Serialization.cpp	2007-03-11 18:41:29 UTC (rev 2062)
+++ trunk/csp/cspsim/wf/Serialization.cpp	2007-03-12 19:33:53 UTC (rev 2063)
@@ -283,7 +283,7 @@
 	}	
 }
 
-void ToValue(XMLNode& node, const std::string& src, osg::Vec4* dst) {
+void ToValue(XMLNode& /* node */, const std::string& src, osg::Vec4* dst) {
 	std::istringstream data(src);
 	
 	unsigned int rgba = 0;
@@ -302,7 +302,7 @@
 	dst->_v[3] = alpha * step;	
 }
 
-void ToValue(XMLNode& node, const std::string& src, bool* dst) {
+void ToValue(XMLNode& /* node */, const std::string& src, bool* dst) {
 	if(src == "1" || src == "true") {
 		*dst = true;
 	} 
@@ -311,19 +311,19 @@
 	}
 }
 
-void ToValue(XMLNode& node, const std::string& src, float* dst) {
+void ToValue(XMLNode& /* node */, const std::string& src, float* dst) {
 	*dst = (float)atof(src.c_str());
 }
 
-void ToValue(XMLNode& node, const std::string& src, double* dst) {
+void ToValue(XMLNode& /* node */, const std::string& src, double* dst) {
 	*dst = atof(src.c_str());
 }
 
-void ToValue(XMLNode& node, const std::string& src, std::string* dst) {
+void ToValue(XMLNode& /* node */, const std::string& src, std::string* dst) {
 	*dst = src;
 }
 
-void ToValue(XMLNode& node, const std::string& src, Ref<wf::Control>* dst) {
+void ToValue(XMLNode& node, const std::string& /* src */, Ref<wf::Control>* dst) {
 	int childNodeCount = node.nChildNode();
 	if(childNodeCount > 0) {
 		XMLNode childNode = node.getChildNode(0);
@@ -331,7 +331,7 @@
 	}
 }
 
-void ToValue(XMLNode& node, const std::string& src, ControlVector* dst) {
+void ToValue(XMLNode& node, const std::string& /* src */, ControlVector* dst) {
 	int childNodeCount = node.nChildNode();
 	for(int index = 0;index < childNodeCount;++index) {
 		XMLNode childNode = node.getChildNode(index);
@@ -342,7 +342,7 @@
 	}
 }
 
-void ToValue(XMLNode& node, const std::string& src, ListBoxItemVector* dst) {
+void ToValue(XMLNode& node, const std::string& /* src */, ListBoxItemVector* dst) {
 	int childNodeCount = node.nChildNode();
 	for(int index = 0;index < childNodeCount;++index) {
 		XMLNode childNode = node.getChildNode(index);
@@ -353,12 +353,12 @@
 	}
 }
 
-void ToValue(XMLNode& node, const std::string& src, Style* dst) {
+void ToValue(XMLNode& node, const std::string& /* src */, Style* dst) {
 	ReadingArchive archive;
 	archive.load(dst, node);
 }
 
-void ToValue(XMLNode& node, const std::string& src, NamedStyleMap* dst) {
+void ToValue(XMLNode& node, const std::string& /* src */, NamedStyleMap* dst) {
 	int childNodeCount = node.nChildNode();
 	for(int index = 0;index < childNodeCount;++index) {
 		XMLNode childNode = node.getChildNode(index);
@@ -372,7 +372,7 @@
 	}
 }
 
-void ToValue(XMLNode& node, const std::string& src, TabPageVector* dst) {
+void ToValue(XMLNode& node, const std::string& /* src */, TabPageVector* dst) {
 	int childNodeCount = node.nChildNode();
 	for(int index = 0;index < childNodeCount;++index) {
 		XMLNode childNode = node.getChildNode(index);
@@ -383,7 +383,7 @@
 	}
 }
 
-void ToValue(XMLNode& node, const std::string& src, TableControlContainer::ColumnVector* dst) {
+void ToValue(XMLNode& node, const std::string& /* src */, TableControlContainer::ColumnVector* dst) {
 	int childNodeCount = node.nChildNode();
 	for(int index = 0;index < childNodeCount;++index) {
 		XMLNode childNode = node.getChildNode(index);
@@ -396,7 +396,7 @@
 	}
 }
 
-void ToValue(XMLNode& node, const std::string& src, TableControlContainer::RowVector* dst) {
+void ToValue(XMLNode& node, const std::string& /* src */, TableControlContainer::RowVector* dst) {
 	int childNodeCount = node.nChildNode();
 	for(int index = 0;index < childNodeCount;++index) {
 		XMLNode childNode = node.getChildNode(index);
@@ -409,7 +409,7 @@
 	}
 }
 
-void ToValue(XMLNode& node, const std::string& src, TableControlContainer::XYVector* dst) {
+void ToValue(XMLNode& node, const std::string& /* src */, TableControlContainer::XYVector* dst) {
 	bool resizeVector = true;
 
 	// Iterate all rows that is found.

Modified: trunk/csp/cspsim/windows/MainMenu.cpp
===================================================================
--- trunk/csp/cspsim/windows/MainMenu.cpp	2007-03-11 18:41:29 UTC (rev 2062)
+++ trunk/csp/cspsim/windows/MainMenu.cpp	2007-03-12 19:33:53 UTC (rev 2063)
@@ -25,7 +25,7 @@
 #include <csp/csplib/data/DataManager.h>
 #include <csp/cspsim/CSPSim.h>
 #include <csp/cspsim/DynamicObject.h>
-#include <csp/cspsim/battlefield/LocalBattleField.h>
+#include <csp/cspsim/battlefield/LocalBattlefield.h>
 #include <csp/cspsim/wf/Button.h>
 #include <csp/cspsim/wf/Serialization.h>
 #include <csp/cspsim/wf/WindowManager.h>

Modified: trunk/csp/dist/win/demo/makedemo.py
===================================================================
--- trunk/csp/dist/win/demo/makedemo.py	2007-03-11 18:41:29 UTC (rev 2062)
+++ trunk/csp/dist/win/demo/makedemo.py	2007-03-12 19:33:53 UTC (rev 2063)
@@ -158,7 +158,7 @@
 		copy_tree(DATA, DATA_TARGET, exclude=r'^\.svn$')
 
 	print 'Writing README header'
-	README = os.path.join(DEMO, 'README')
+	README = os.path.join(DEMO, 'README.txt')
 	readme = open(README).read()
 	open(README, 'wt').write(readme % {'VERSION': version, 'DATE': time.strftime('%Y-%m-%d')})