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

[jacobsr at orxonox.net]

Author: jacobsr
Date: 2018-04-19 14:07:29 +0200 (Thu, 19 Apr 2018)
New Revision: 11881

Modified:
   code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw
   code/branches/OrxyRoad_FS18/src/modules/CMakeLists.txt
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.h
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.h
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.h
Log:
fix

Modified: code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw
===================================================================
--- code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw	2018-04-19 11:40:45 UTC (rev 11880)
+++ code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw	2018-04-19 12:07:29 UTC (rev 11881)
@@ -1,5 +1,5 @@
 <LevelInfo
- name = "OrxyRoad"
+ name = "Orxy Road"
  description = "Try to come as far as possible"
  tags = "minigame"
  screenshot = "OrxyRoad.png"
@@ -19,7 +19,7 @@
 ?>
 
 <Level
-  plugins = dodgerace
+  plugins = orxyroad
   gametype = OrxyRoad
 >
   <templates>

Modified: code/branches/OrxyRoad_FS18/src/modules/CMakeLists.txt
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/CMakeLists.txt	2018-04-19 11:40:45 UTC (rev 11880)
+++ code/branches/OrxyRoad_FS18/src/modules/CMakeLists.txt	2018-04-19 12:07:29 UTC (rev 11881)
@@ -48,3 +48,4 @@
 ADD_SUBDIRECTORY(superorxobros)
 ADD_SUBDIRECTORY(asteroids2D)
 ADD_SUBDIRECTORY(flappyorx)
+ADD_SUBDIRECTORY(orxyroad)

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt	2018-04-19 11:40:45 UTC (rev 11880)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt	2018-04-19 12:07:29 UTC (rev 11881)
@@ -1,4 +1,4 @@
-SET_SOURCE_FILES(Dodgerace_SRC_FILES
+SET_SOURCE_FILES(OrxyRoad_SRC_FILES
 OrxyRoad.cc
 OrxyRoadCenterPoint.cc
 OrxyRoadShip.cc

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.h
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.h	2018-04-19 11:40:45 UTC (rev 11880)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.h	2018-04-19 12:07:29 UTC (rev 11881)
@@ -35,7 +35,7 @@
 #ifndef _OrxyRoadCenterPoint_H__
 #define _OrxyRoadCenterPoint_H__
 
-#include "OrxyRoad/OrxyRoadPrereqs.h"
+#include "OrxyRoadPrereqs.h"
 
 //#include "OrxyRoad.h"
 //#include "OrxyRoadHUDinfo.h"

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.h
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.h	2018-04-19 11:40:45 UTC (rev 11880)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.h	2018-04-19 12:07:29 UTC (rev 11881)
@@ -35,7 +35,7 @@
 #ifndef _OrxyRoadCube_H__
 #define _OrxyRoadCube_H__
 
-#include "OrxyRoad/OrxyRoadPrereqs.h"
+#include "OrxyRoadPrereqs.h"
 
 #include "worldentities/MovableEntity.h"
 

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.h
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.h	2018-04-19 11:40:45 UTC (rev 11880)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.h	2018-04-19 12:07:29 UTC (rev 11881)
@@ -31,7 +31,7 @@
 #include "OrxyRoad.h"
 //#include "OrxyRoadCenterPoint.h"
 
-#include "OrxyRoad/OrxyRoadPrereqs.h"
+#include "OrxyRoadPrereqs.h"
 
 #include "tools/interfaces/Tickable.h"
 #include "overlays/OverlayText.h"