[Orxonox-commit 7736] r12329 - in code/branches/OrxoBlox_FS19: data/levels src/modules/OrxoBlox

[pomselj at orxonox.net]

Author: pomselj
Date: 2019-05-02 13:38:57 +0200 (Thu, 02 May 2019)
New Revision: 12329

Modified:
   code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
Log:
new, better camera

Modified: code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
===================================================================
--- code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-05-02 11:35:32 UTC (rev 12328)
+++ code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-05-02 11:38:57 UTC (rev 12329)
@@ -15,6 +15,7 @@
 <?lua
   include("templates/spaceshipAssff2.oxt")
   include("templates/spaceshipPirate.oxt")
+  include("templates/spaceshipAsteroids2D.oxt")
   include("templates/spaceshipOrxoBlox.oxt")
   include("templates/enemyInvader.oxt")
   include("overlays/Asteroids2DHUD.oxo")
@@ -102,7 +103,7 @@
   >
     <!-- <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="0,0,0" lookat="0,0,0" spawnclass= Asteroids2DShip />
+    <SpawnPoint team=0 position="0,150,0" lookat="0,0,0" spawnclass= OrxoBloxShip pawndesign=spaceshipasteroids2d/>
 
     <!--<Model mesh="axes.mesh" scale=10 position="0,0,0" /> -->
 

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc	2019-05-02 11:35:32 UTC (rev 12328)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc	2019-05-02 11:38:57 UTC (rev 12329)
@@ -164,14 +164,11 @@
         this->starttimer_.startTimer();
 
         // Set variable to temporarily force the player to spawn.
-        bool temp = this->bForceSpawn_;
-        this->bForceSpawn_ = true;
+        this->bForceSpawn_ = false;
 
         // Call start for the parent class.
         Deathmatch::start();
 
-        // Reset the variable.
-        this->bForceSpawn_ = temp;
     }
 
     /**