[Orxonox-commit 7272] r11887 - in code/branches/OrxyRoad_FS18: data/levels src/modules/orxyroad

[jacobsr at orxonox.net]

Author: jacobsr
Date: 2018-04-19 14:59:23 +0200 (Thu, 19 Apr 2018)
New Revision: 11887

Modified:
   code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc
Log:
trying synch files

Modified: code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw
===================================================================
--- code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw	2018-04-19 12:46:18 UTC (rev 11886)
+++ code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw	2018-04-19 12:59:23 UTC (rev 11887)
@@ -21,7 +21,7 @@
 <Level
   plugins = orxyroad
   gametype = OrxyRoad
->
+  >
   <templates>
     <Template link=lodtemplate_default />
   </templates>

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt	2018-04-19 12:46:18 UTC (rev 11886)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt	2018-04-19 12:59:23 UTC (rev 11887)
@@ -1,11 +1,12 @@
 SET_SOURCE_FILES(OrxyRoad_SRC_FILES
 OrxyRoad.cc
 OrxyRoadCenterPoint.cc
-OrxyRoadShip.cc
+OrxyRoadRaceShip.cc
 OrxyRoadCube.cc
 OrxyRoadHUDinfo.cc
 )
 
+
 ORXONOX_ADD_LIBRARY(orxyroad
   PLUGIN
   FIND_HEADER_FILES

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc	2018-04-19 12:46:18 UTC (rev 11886)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc	2018-04-19 12:59:23 UTC (rev 11887)
@@ -117,9 +117,9 @@
                     cubeList.push_back(cube);
                     switch(pattern)
                     {
-                    case 1: cube->addTemplate("OrxyRoadCube01");
+                    case 1: cube->addTemplate("DodgeRaceCube01");
                     break;
-                    case 2: cube->addTemplate("OrxyRoadCube02");
+                    case 2: cube->addTemplate("DodgeRaceCube01");
                     break;
 
                     }