Changeset 11886 for code/branches

Timestamp:

Apr 19, 2018, 2:46:18 PM (7 years ago)

Author:

sehirsch

Message:

fixed plugin name in CMakeLists.txt

Location:

code/branches/OrxyRoad_FS18/src/modules/orxyroad

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxyRoad.cc (modified) (3 diffs)
• OrxyRoad.h (modified) (2 diffs)

code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt

@@ -7 +7 @@
 )
 
-ORXONOX_ADD_LIBRARY(orxyRoad
+ORXONOX_ADD_LIBRARY(orxyroad
   PLUGIN
   FIND_HEADER_FILES

code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc

@@ -43 +43 @@
     RegisterUnloadableClass(OrxyRoad);
 
-    OrxyRoad::OrxyRoad(Context* context) : Deathmatch(context)
+    OrxyRoad::OrxyRoad(Context* context) : Gametype(context)
     {
         RegisterObject(OrxyRoad);
@@ -126 +126 @@
 
                     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);
                 }
@@ -183 +191 @@
             return;
         }
-        // Call start for the parent class.
-        Deathmatch::start();
     }
 

code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.h

@@ -57 +57 @@
 #include "core/command/ConsoleCommand.h"
 
-#include "gametypes/Deathmatch.h"
+#include "gametypes/Gametype.h"
 #include "tools/Timer.h"
 
@@ -63 +63 @@
 {
 
-    class _OrxyRoadExport OrxyRoad : public Deathmatch
+    class _OrxyRoadExport OrxyRoad : public Gametype
     {
        public: