[Orxonox-commit 5941] r10600 - code/branches/SciptableControllerFS15/src/orxonox/controllers

[landauf at orxonox.net]

Author: landauf
Date: 2015-09-27 21:11:20 +0200 (Sun, 27 Sep 2015)
New Revision: 10600

Modified:
   code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc
   code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.h
Log:
fixed warnings

Modified: code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc
===================================================================
--- code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc	2015-09-27 12:02:00 UTC (rev 10599)
+++ code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc	2015-09-27 19:11:20 UTC (rev 10600)
@@ -20,7 +20,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      ...
  *   Co-authors:
  *      ...
  *
@@ -38,11 +38,8 @@
   * "Spiral"            | spi          | GoTo X Coordinate    | '' Y ''  | '' Z '' |          -           |     -    |     -    | Duration
   * "Transition Look"   | chl          | From X Coordinate    | '' Y ''  | '' Z '' | To X Coordinate      |  '' Y '' |  '' Y '' | Duration
   * "Idle (Do nothing)" | idle         | Duration
-  /
+  */
 
-// TODO: Which library can this be found in?
-#define M_PI 3.14159265358979323846 /* pi */
-
 #include "ScriptController.h"
 #include "infos/PlayerInfo.h"
 #include "core/CoreIncludes.h"
@@ -87,9 +84,6 @@
         /* - First "previous event" scheduled at t=0 */
         /* - Needed for automatically updating event times */
         this->prevEventTime = 0;
-
-        /* hack */
-        this->deltat;
     }
 
     void ScriptController::takeControl(int ctrlid)
@@ -170,9 +164,6 @@
 
     void ScriptController::tick(float dt)
     {
-        /* hack */
-        this->deltat = dt;
-
         /* Call the tick function of the classes we derive from */
         SUPER(ScriptController, tick, dt);
 

Modified: code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.h
===================================================================
--- code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.h	2015-09-27 12:02:00 UTC (rev 10599)
+++ code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.h	2015-09-27 19:11:20 UTC (rev 10600)
@@ -20,7 +20,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      ...
  *   Co-authors:
  *      ...
  *
@@ -124,9 +124,6 @@
             /* Time of the previously scheduled event */
             float prevEventTime;
 
-            /* Hack: Gain access to delta t */
-            float deltat;
-
             /* - Position to look at during that transition */
             //Vector3 lookAtPosition;