Changeset 12329 for code/branches/OrxoBlox_FS19

Timestamp:

May 2, 2019, 1:38:57 PM (6 years ago)

Author:

pomselj

Message:

new, better camera

Location:

code/branches/OrxoBlox_FS19

Files:

• data/levels/orxoblox.oxw (modified) (2 diffs)
• src/modules/OrxoBlox/OrxoBlox.cc (modified) (1 diff)

code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw

@@ -16 +16 @@
   include("templates/spaceshipAssff2.oxt")
   include("templates/spaceshipPirate.oxt")
+  include("templates/spaceshipAsteroids2D.oxt")
   include("templates/spaceshipOrxoBlox.oxt")
   include("templates/enemyInvader.oxt")
@@ -103 +104 @@
     <!-- <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" /> -->

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

@@ -165 +165 @@
 
         // 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;
     }