[Orxonox-commit 5556] r10219 - in code/branches/presentationHS14/src/modules: dodgerace2 towerdefense

landauf at orxonox.net landauf at orxonox.net
Sat Jan 31 23:54:35 CET 2015


Author: landauf
Date: 2015-01-31 23:54:35 +0100 (Sat, 31 Jan 2015)
New Revision: 10219

Modified:
   code/branches/presentationHS14/src/modules/dodgerace2/DodgeRace.cc
   code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseTower.cc
Log:
fixed build (DodgeRace) and warnings (TowerDefenseTower) for MinGW on Windows

Modified: code/branches/presentationHS14/src/modules/dodgerace2/DodgeRace.cc
===================================================================
--- code/branches/presentationHS14/src/modules/dodgerace2/DodgeRace.cc	2015-01-31 22:29:45 UTC (rev 10218)
+++ code/branches/presentationHS14/src/modules/dodgerace2/DodgeRace.cc	2015-01-31 22:54:35 UTC (rev 10219)
@@ -97,7 +97,7 @@
 			point = currentPosition;
 			getPlayer()->speed = 830 - (point / 1000);
 
-			for(uint i=0; i < cubeList.size();i++)
+			for(unsigned int i=0; i < cubeList.size();i++)
 			{
 				if(cubeList.at(i)->getPosition().x < currentPosition-3000)
 				{
@@ -168,7 +168,7 @@
     {
     	orxout() << "start" << endl;
         init();
-		for(uint i=0; i< cubeList.size();i++)
+		for(unsigned int i=0; i< cubeList.size();i++)
 		{
 			cubeList.at(i)->destroy();
 			cubeList.erase(cubeList.begin()+i);

Modified: code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseTower.cc
===================================================================
--- code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseTower.cc	2015-01-31 22:29:45 UTC (rev 10218)
+++ code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseTower.cc	2015-01-31 22:54:35 UTC (rev 10219)
@@ -39,26 +39,18 @@
 
     void TowerDefenseTower::setOrientation(const Quaternion& orientation)
     {
-        static int ori;
-        //orxout() << "orientation " << ++ori << endl;
     }
 
     void TowerDefenseTower::rotateYaw(const Vector2& value)
     {
-        static int yaw;
-        //orxout() << "rotateYaw " << ++yaw << endl;
     }
 
     void TowerDefenseTower::rotatePitch(const Vector2& value)
     {
-        static int pitch;
-        //orxout() << "rotatePitch " << ++pitch << endl;
     }
 
     void TowerDefenseTower::rotateRoll(const Vector2& value)
     {
-        static int roll;
-        //orxout() << "rotateRoll" << ++roll << endl;
     }
 
     bool TowerDefenseTower::upgradeTower()




More information about the Orxonox-commit mailing list