- Timestamp:
- Apr 18, 2019, 4:24:49 PM (6 years ago)
- Location:
- code/branches/OrxoBlox_FS19
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
r12310 r12314 11 11 include("OrxoBloxHUD.oxo") 12 12 include("templates/lodInformation.oxt") 13 ?> 14 15 <?lua 16 include("templates/spaceshipAssff2.oxt") 17 include("templates/spaceshipPirate.oxt") 18 include("templates/spaceshipOrxoBlox.oxt") 19 include("templates/enemyInvader.oxt") 20 include("overlays/Asteroids2DHUD.oxo") 21 include("templates/asteroidsAsteroids2D.oxt") 13 22 ?> 14 23 -
code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
r12310 r12314 52 52 #include "OrxoBloxStones.h" 53 53 #include "OrxoBloxWall.h" 54 #include "OrxoBloxShip.h" 54 55 55 56 … … 190 191 /** 191 192 @brief 192 Spawns players, and fills the rest up with bots.193 */194 void OrxoBlox::spawnPlayersIfRequested()195 {196 // first spawn human players to assign always the left bat to the player in singleplayer197 for (const auto& mapEntry : this->players_)198 if (mapEntry.first->isHumanPlayer() && (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_))199 this->spawnPlayer(mapEntry.first);200 // now spawn bots201 for (const auto& mapEntry : this->players_)202 if (!mapEntry.first->isHumanPlayer() && (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_))203 this->spawnPlayer(mapEntry.first);204 }205 206 207 /**208 @brief209 193 Spawns the input player. 210 194 @param player … … 222 206 } 223 207 224 /** 225 @brief 226 Is called when the player scored. 227 */ 228 208 OrxoBloxShip* OrxoBlox::getPlayer() 209 { 210 for (OrxoBloxShip* ship : ObjectList<OrxoBloxShip>()) 211 { 212 return ship; 213 } 214 return nullptr; 215 } 216 229 217 //void startWall(void); 230 218 -
code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h
r12308 r12314 74 74 virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player. 75 75 76 76 OrxoBloxShip* getPlayer(); 77 77 78 78 /** … … 87 87 88 88 protected: 89 virtual void spawnPlayersIfRequested() override; //!< Spawns players, and fills the rest up with bots.90 89 private: 91 90 void startWall(void); -
code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h
r12308 r12314 74 74 class OrxoBloxWall; 75 75 class OrxobloxStones; 76 class OrxoBloxShip; 76 77 } 77 78
Note: See TracChangeset
for help on using the changeset viewer.