Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11757


Ignore:
Timestamp:
Feb 17, 2018, 11:06:06 PM (6 years ago)
Author:
landauf
Message:

[FlappyOrx_HS17] removed FlappyOrxCenterPoint, it doesn't seem to be neede

Location:
code/branches/Presentation_HS17_merge
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw

    r11756 r11757  
    3535    <SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=FlappyOrxShip pawndesign=spaceshipFlappyOrx />
    3636 
    37     <FlappyOrxCenterPoint name=flappyorxcenter />
    38    
    39    
    40 
    4137    <?lua
    4238      for i = 1, 5, 1 do

  • code/branches/Presentation_HS17_merge/src/modules/flappyorx/CMakeLists.txt

    r11624 r11757  
    22BUILD_UNIT FlappyOrxBuildUnit.cc
    33  FlappyOrx.cc
    4   FlappyOrxCenterPoint.cc
    54  FlappyOrxShip.cc
    65  FlappyOrxHUDinfo.cc

  • code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc

    r11755 r11757  
    4848#include "infos/PlayerInfo.h"
    4949
    50 #include "FlappyOrxCenterPoint.h"
    5150#include "FlappyOrxShip.h"
    5251
    … …  
    6261    {
    6362        RegisterObject(FlappyOrx);
    64         this->center_ = nullptr;
     63
    6564        point = 0;                          //number of cleared tubes
    6665        bIsDead = true;
    … …  
    158157    //Create a new Asteroid
    159158    void FlappyOrx::createAsteroid(Circle &c){
    160         MovableEntity* newAsteroid = new MovableEntity(this->center_->getContext());
     159        MovableEntity* newAsteroid = new MovableEntity(player->getContext());
    161160
    162161        //Add Model fitting the Size of the Asteroid
    … …  
    219218    }
    220219
    221     void FlappyOrx::setCenterpoint(FlappyOrxCenterPoint* center){
    222         this->center_ = center;
    223     }
    224 
    225220    bool FlappyOrx::isDead(){
    226221        return bIsDead;
    … …  
    240235        this->bForceSpawn_ = true;
    241236
    242         if (this->center_ == nullptr)  // abandon mission!
    243         {
    244             orxout(internal_error) << "FlappyOrx: No Centerpoint specified." << endl;
    245             GSLevel::startMainMenu();
    246             return;
    247         }
    248237        // Call start for the parent class.
    249238        Deathmatch::start();

  • code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h

    r11755 r11757  
    7474            void asteroidField(float x, float y, float slope);
    7575            void spawnTube();
    76            
    77             void setCenterpoint(FlappyOrxCenterPoint* center);
    7876           
    7977            int getPoints(){return this->point;}
    … …  
    126124            int addIfPossible(Circle c);
    127125
    128             WeakPtr<FlappyOrxCenterPoint> center_;
    129126            WeakPtr<FlappyOrxShip> player;
    130127

  • code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxPrereqs.h

    r11753 r11757  
    7070{
    7171    class FlappyOrx;
    72     class FlappyOrxCenterPoint;
    7372    class FlappyOrxShip;
    7473    class FlappyOrxHUDinfo;
Note: See TracChangeset for help on using the changeset viewer.