Changeset 12314

Timestamp:

Apr 18, 2019, 4:24:49 PM (6 years ago)

Author:

pomselj

Message:

some stuff, going home tbh

Location:

code/branches/OrxoBlox_FS19

Files:

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

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

@@ -11 +11 @@
   include("OrxoBloxHUD.oxo")
   include("templates/lodInformation.oxt")
+?>
+
+<?lua
+  include("templates/spaceshipAssff2.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/spaceshipOrxoBlox.oxt")
+  include("templates/enemyInvader.oxt")
+  include("overlays/Asteroids2DHUD.oxo")
+  include("templates/asteroidsAsteroids2D.oxt")
 ?>
 

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

@@ -52 +52 @@
 #include "OrxoBloxStones.h"
 #include "OrxoBloxWall.h"
+#include "OrxoBloxShip.h"
 
 
@@ -190 +191 @@
     /**
     @brief
-        Spawns players, and fills the rest up with bots.
-    */
-    void OrxoBlox::spawnPlayersIfRequested()
-    {
-        // first spawn human players to assign always the left bat to the player in singleplayer
-        for (const auto& mapEntry : this->players_)
-            if (mapEntry.first->isHumanPlayer() && (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_))
-                this->spawnPlayer(mapEntry.first);
-        // now spawn bots
-        for (const auto& mapEntry : this->players_)
-            if (!mapEntry.first->isHumanPlayer() && (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_))
-                this->spawnPlayer(mapEntry.first);
-    }
-
-
-    /**
-    @brief
         Spawns the input player.
     @param player
@@ -222 +206 @@
     }
 
-    /**
-    @brief
-        Is called when the player scored.
-    */
-    
+    OrxoBloxShip* OrxoBlox::getPlayer()
+    {
+        for (OrxoBloxShip* ship : ObjectList<OrxoBloxShip>())
+        {
+            return ship;
+        }
+        return nullptr;
+    }
+
     //void startWall(void);
     

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

@@ -74 +74 @@
             virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
 
-            
+            OrxoBloxShip* getPlayer();
 
             /**
@@ -87 +87 @@
 
         protected:
-            virtual void spawnPlayersIfRequested() override; //!< Spawns players, and fills the rest up with bots.
         private:
             void startWall(void);

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h

@@ -74 +74 @@
     class OrxoBloxWall;
     class OrxobloxStones;
+    class OrxoBloxShip;
 }