Changeset 11899 for code/branches

Timestamp:

Apr 24, 2018, 10:32:56 AM (7 years ago)

Author:

jacobsr

Message:

restored orxyroad to dodgerace state, fixed waiting for players issue

Location:

code/branches/OrxyRoad_FS18

Files:

• data/levels/OrxyRoad.oxw (modified) (1 diff)
• data/levels/templates/spaceshipOrxyRoad.oxt (modified) (3 diffs)
• src/modules/orxyroad/CMakeLists.txt (modified) (2 diffs)
• src/modules/orxyroad/OrxyRoad.cc (modified) (4 diffs)
• src/modules/orxyroad/OrxyRoad.h (modified) (2 diffs)
• src/modules/orxyroad/OrxyRoadCube.cc (modified) (1 diff)
• src/modules/orxyroad/OrxyRoadShip.cc (modified) (1 diff)

code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw

@@ -43 +43 @@
     <!-- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> -->
     <Light type=directional position="-100, 10000, -700" lookat="0.2, -1, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=OrxyRoadShip pawndesign=spaceshipdodgerace />
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=OrxyRoadShip pawndesign=spaceshiporxyroad />
 
     <DistanceTrigger name="start" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=0 />

code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt

@@ -1 @@
-<Template name=spaceshipdodgerace>
-  <DodgeRaceShip
+<Template name=spaceshiporxyroad>
+  <OrxyRoadShip
    hudtemplate            = spaceshiphud
    camerapositiontemplate = spaceshipescortcameras
@@ -74 +74 @@
   include("../includes/invaderWeapon.oxi")
 ?>
-  </DodgeRaceShip>
+  </OrxyRoadShip>
 </Template>
 
 <Template name=spaceshipescortcameras defaults=0>
-  <DodgeRaceShip>
+  <OrxyRoadShip>
     <camerapositions>
                 <CameraPosition position="0,100,180" direction="0, -0.2, -1" drag=false mouselook=true />
@@ -85 +85 @@
                 <CameraPosition position="0,1300,-100" direction="0, -1, 0" drag=false mouselook=true />
     </camerapositions>
-  </DodgeRaceShip>
+  </OrxyRoadShip>
 </Template>
 

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

@@ -1 @@
-SET_SOURCE_FILES(OrxyRoad_SRC_FILES
+SET_SOURCE_FILES(Orxyroad_SRC_FILES
 OrxyRoad.cc
 OrxyRoadCenterPoint.cc
@@ -14 +14 @@
     orxonox
     overlays
-  SOURCE_FILES ${OrxyRoad_SRC_FILES}
+  SOURCE_FILES ${Orxyroad_SRC_FILES}
 )

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

@@ -43 +43 @@
     RegisterUnloadableClass(OrxyRoad);
 
-    OrxyRoad::OrxyRoad(Context* context) : Gametype(context)
+    OrxyRoad::OrxyRoad(Context* context) : Deathmatch(context)
     {
         RegisterObject(OrxyRoad);
@@ -118 +118 @@
                     switch(pattern)
                     {
-                    case 1: cube->addTemplate("DodgeRaceCube01");
+                    case 1: cube->addTemplate("OrxyRoadCube01");
                     break;
-                    case 2: cube->addTemplate("DodgeRaceCube01");
+                    case 2: cube->addTemplate("OrxyRoadCube01");
                     break;
 
@@ -191 +191 @@
             return;
         }
+        Deathmatch::start();
     }
 
@@ -234 +235 @@
         {
             int score = this->getPoints();
-            Highscore::getInstance().storeScore("Dodge Race", score, this->playerInfo_);
+            Highscore::getInstance().storeScore("Orxy Road ", score, this->playerInfo_);
         }
         GSLevel::startMainMenu();

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

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

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

@@ +1 @@
+
 /*   ORXONOX - the hottest 3D action shooter ever to exist
  *                    > www.orxonox.net <

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

@@ -55 +55 @@
     void OrxyRoadShip::tick(float dt)
     {
+        orxout(user_info) << "This is some cool output!" << endl;
+
         Vector3 pos = getPosition();