[Orxonox-commit 7276] r11891 - code/branches/OrxyRoad_FS18/src/modules/orxyroad

[jacobsr at orxonox.net]

Author: jacobsr
Date: 2018-04-19 16:06:26 +0200 (Thu, 19 Apr 2018)
New Revision: 11891

Modified:
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadPrereqs.h
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.h
Log:
changed name 

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc	2018-04-19 13:59:52 UTC (rev 11890)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc	2018-04-19 14:06:26 UTC (rev 11891)
@@ -128,7 +128,7 @@
                     
                     /* experimental */
 
-                    cube->setVelocity(10,0,0);
+                    //cube->setVelocity(10,0,0);
 
                     /* experimental */
 

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadPrereqs.h
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadPrereqs.h	2018-04-19 13:59:52 UTC (rev 11890)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadPrereqs.h	2018-04-19 14:06:26 UTC (rev 11891)
@@ -42,8 +42,8 @@
 // Shared library settings
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(OrxyRoad_STATIC_BUILD)
-#  ifdef OrxyRoad_SHARED_BUILD
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXYROAD_STATIC_BUILD)
+#  ifdef ORXYROAD_SHARED_BUILD
 #    define _OrxyRoadExport __declspec(dllexport)
 #  else
 #    if defined( __MINGW32__ )

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.h
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.h	2018-04-19 13:59:52 UTC (rev 11890)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.h	2018-04-19 14:06:26 UTC (rev 11891)
@@ -42,7 +42,7 @@
 #include "graphics/Camera.h"
 
 #include "OrxyRoad.h" // Is necessary for getGame function
-//#include "OrxyRoadCenterPoint.h"
+#include "OrxyRoadCenterPoint.h"
 
 namespace orxonox
 {