Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12314 for code


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw

    r12310 r12314  
    1111  include("OrxoBloxHUD.oxo")
    1212  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")
    1322?>
    1423
  • code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

    r12310 r12314  
    5252#include "OrxoBloxStones.h"
    5353#include "OrxoBloxWall.h"
     54#include "OrxoBloxShip.h"
    5455
    5556
     
    190191    /**
    191192    @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 singleplayer
    197         for (const auto& mapEntry : this->players_)
    198             if (mapEntry.first->isHumanPlayer() && (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_))
    199                 this->spawnPlayer(mapEntry.first);
    200         // now spawn bots
    201         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     @brief
    209193        Spawns the input player.
    210194    @param player
     
    222206    }
    223207
    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
    229217    //void startWall(void);
    230218   
  • code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h

    r12308 r12314  
    7474            virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
    7575
    76            
     76            OrxoBloxShip* getPlayer();
    7777
    7878            /**
     
    8787
    8888        protected:
    89             virtual void spawnPlayersIfRequested() override; //!< Spawns players, and fills the rest up with bots.
    9089        private:
    9190            void startWall(void);
  • code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h

    r12308 r12314  
    7474    class OrxoBloxWall;
    7575    class OrxobloxStones;
     76    class OrxoBloxShip;
    7677}
    7778
Note: See TracChangeset for help on using the changeset viewer.