[Orxonox-commit 7271] r11886 - code/branches/OrxyRoad_FS18/src/modules/orxyroad

[sehirsch at orxonox.net]

Author: sehirsch
Date: 2018-04-19 14:46:18 +0200 (Thu, 19 Apr 2018)
New Revision: 11886

Modified:
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.h
Log:
fixed plugin name in CMakeLists.txt

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt	2018-04-19 12:22:56 UTC (rev 11885)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt	2018-04-19 12:46:18 UTC (rev 11886)
@@ -6,7 +6,7 @@
 OrxyRoadHUDinfo.cc
 )
 
-ORXONOX_ADD_LIBRARY(orxyRoad
+ORXONOX_ADD_LIBRARY(orxyroad
   PLUGIN
   FIND_HEADER_FILES
   LINK_LIBRARIES

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc	2018-04-19 12:22:56 UTC (rev 11885)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc	2018-04-19 12:46:18 UTC (rev 11886)
@@ -42,7 +42,7 @@
 {
     RegisterUnloadableClass(OrxyRoad);
 
-    OrxyRoad::OrxyRoad(Context* context) : Deathmatch(context)
+    OrxyRoad::OrxyRoad(Context* context) : Gametype(context)
     {
         RegisterObject(OrxyRoad);
 
@@ -125,6 +125,14 @@
                     }
 
                     cube->setPosition(player->getWorldPosition() + Vector3(5000.0f, 0.0f, -3600.0f + (i*1200)));
+                    
+                    /* experimental */
+
+                    cube->setVelocity(10,0,0);
+
+                    /* experimental */
+
+
                     //stEntity->setScale3D(50,50,50);
                 }
 
@@ -182,8 +190,6 @@
             GSLevel::startMainMenu();
             return;
         }
-        // Call start for the parent class.
-        Deathmatch::start();
     }
 
     void OrxyRoad::playerPreSpawn(PlayerInfo* player)

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.h
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.h	2018-04-19 12:22:56 UTC (rev 11885)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.h	2018-04-19 12:46:18 UTC (rev 11886)
@@ -56,13 +56,13 @@
 
 #include "core/command/ConsoleCommand.h"
 
-#include "gametypes/Deathmatch.h"
+#include "gametypes/Gametype.h"
 #include "tools/Timer.h"
 
 namespace orxonox
 {
 
-    class _OrxyRoadExport OrxyRoad : public Deathmatch
+    class _OrxyRoadExport OrxyRoad : public Gametype
     {
        public:
             OrxyRoad(Context* context);