Changeset 11757
- Timestamp:
- Feb 17, 2018, 11:06:06 PM (7 years ago)
- 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 35 35 <SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=FlappyOrxShip pawndesign=spaceshipFlappyOrx /> 36 36 37 <FlappyOrxCenterPoint name=flappyorxcenter />38 39 40 41 37 <?lua 42 38 for i = 1, 5, 1 do -
code/branches/Presentation_HS17_merge/src/modules/flappyorx/CMakeLists.txt
r11624 r11757 2 2 BUILD_UNIT FlappyOrxBuildUnit.cc 3 3 FlappyOrx.cc 4 FlappyOrxCenterPoint.cc5 4 FlappyOrxShip.cc 6 5 FlappyOrxHUDinfo.cc -
code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc
r11755 r11757 48 48 #include "infos/PlayerInfo.h" 49 49 50 #include "FlappyOrxCenterPoint.h"51 50 #include "FlappyOrxShip.h" 52 51 … … 62 61 { 63 62 RegisterObject(FlappyOrx); 64 this->center_ = nullptr; 63 65 64 point = 0; //number of cleared tubes 66 65 bIsDead = true; … … 158 157 //Create a new Asteroid 159 158 void FlappyOrx::createAsteroid(Circle &c){ 160 MovableEntity* newAsteroid = new MovableEntity( this->center_->getContext());159 MovableEntity* newAsteroid = new MovableEntity(player->getContext()); 161 160 162 161 //Add Model fitting the Size of the Asteroid … … 219 218 } 220 219 221 void FlappyOrx::setCenterpoint(FlappyOrxCenterPoint* center){222 this->center_ = center;223 }224 225 220 bool FlappyOrx::isDead(){ 226 221 return bIsDead; … … 240 235 this->bForceSpawn_ = true; 241 236 242 if (this->center_ == nullptr) // abandon mission!243 {244 orxout(internal_error) << "FlappyOrx: No Centerpoint specified." << endl;245 GSLevel::startMainMenu();246 return;247 }248 237 // Call start for the parent class. 249 238 Deathmatch::start(); -
code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h
r11755 r11757 74 74 void asteroidField(float x, float y, float slope); 75 75 void spawnTube(); 76 77 void setCenterpoint(FlappyOrxCenterPoint* center);78 76 79 77 int getPoints(){return this->point;} … … 126 124 int addIfPossible(Circle c); 127 125 128 WeakPtr<FlappyOrxCenterPoint> center_;129 126 WeakPtr<FlappyOrxShip> player; 130 127 -
code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxPrereqs.h
r11753 r11757 70 70 { 71 71 class FlappyOrx; 72 class FlappyOrxCenterPoint;73 72 class FlappyOrxShip; 74 73 class FlappyOrxHUDinfo;
Note: See TracChangeset
for help on using the changeset viewer.