[Orxonox-commit 2322] r7037 - code/branches/presentation3/src/orxonox/controllers
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon May 31 09:21:07 CEST 2010
Author: rgrieder
Date: 2010-05-31 09:21:07 +0200 (Mon, 31 May 2010)
New Revision: 7037
Modified:
code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc
Log:
Using C++ includes (limits.h --> climits).
Modified: code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc 2010-05-31 07:02:48 UTC (rev 7036)
+++ code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc 2010-05-31 07:21:07 UTC (rev 7037)
@@ -29,7 +29,10 @@
#include "ArtificialController.h"
#include <vector>
-#include "limits.h"
+#include <climits>
+
+#include "util/Math.h"
+#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "worldentities/ControllableEntity.h"
@@ -40,8 +43,6 @@
#include "controllers/WaypointPatrolController.h"
#include "controllers/NewHumanController.h"
#include "controllers/DroneController.h"
-#include "util/Math.h"
-#include "core/ConsoleCommand.h"
namespace orxonox
{
@@ -71,8 +72,8 @@
this->maxFormationSize_ = STANDARD_MAX_FORMATION_SIZE;
this->myMaster_ = 0;
this->freedomCount_ = 0;
- this->team_ = -1;
- this->state_ = FREE;
+ this->team_ = -1;
+ this->state_ = FREE;
this->specificMasterAction_ = NONE;
this->specificMasterActionHoldCount_ = 0;
this->bShooting_ = false;
More information about the Orxonox-commit
mailing list