Changeset 12370 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox
- Timestamp:
- May 16, 2019, 1:13:21 PM (6 years ago)
- Location:
- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
r12369 r12370 173 173 // Set variable to temporarily force the player to spawn. 174 174 //bool temp = this->bForceSpawn_; 175 this->bForceSpawn_ = true;175 this->bForceSpawn_ = false; 176 176 177 177 // Call start for the parent class. … … 307 307 if((BallPosition.x - Ball->getRadius() >= StonePosition.x - size && BallPosition.x + Ball->getRadius() <= StonePosition.x + size) && 308 308 (BallPosition.z - Ball->getRadius() >= StonePosition.z - size && BallPosition.z + Ball->getRadius() <= StonePosition.z + size)) { 309 orxout() << "FOUND ONE" << endl;309 //orxout() << "FOUND ONE" << endl; 310 310 return someStone; 311 311 } -
code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h
r12367 r12370 90 90 { return this->center_; } 91 91 OrxoBloxStones* CheckForCollision(OrxoBloxBall* Ball); 92 92 virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command 93 93 protected: 94 94 private: -
code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h
r12366 r12370 74 74 class OrxoBloxStones; 75 75 class OrxoBloxScore; 76 class OrxoBloxShip; 76 77 } 77 78 -
code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxShip.cc
r12367 r12370 71 71 SUPER(OrxoBloxShip, tick, dt); 72 72 Vector3 pos = this->getPosition(); 73 this->setPosition(pos); 74 } 73 75 76 void OrxoBloxShip::boost(bool bBoost) 77 { 74 78 } 75 79 76 OrxoBlox* OrxoBloxShip::getGame()77 {78 if (game == nullptr)79 {80 for (OrxoBlox* race : ObjectList<OrxoBlox>())81 {82 game = race;83 }84 }85 return game;86 }87 void OrxoBloxShip::death()88 {89 SpaceShip::death();90 }91 80 } 92 81 -
code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxShip.h
r12367 r12370 51 51 52 52 //no rotation in x and z direction! 53 virtual void rotatePitch(const Vector2& value) override{}; // Rotate in pitch direction. 53 //virtual void rotatePitch(const Vector2& value) override{}; // Rotate in pitch direction. 54 //Yaw 54 55 virtual void rotateRoll(const Vector2& value) override{}; // Rotate in roll direction. 56 virtual void boost(bool boost) override; //Override, so that the ship does not shake 55 57 56 58 /*Functions that can be helpful while debugging. … … 68 70 69 71 protected: 70 virtual void death() override;71 72 private: 72 73 OrxoBlox* getGame();
Note: See TracChangeset
for help on using the changeset viewer.