Changeset 12155 for code/branches/OrxoKart_HS18/src/modules/orxokart
- Timestamp:
- Dec 5, 2018, 12:23:30 PM (6 years ago)
- Location:
- code/branches/OrxoKart_HS18/src/modules/orxokart
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc
r12144 r12155 180 180 // Check if ship collided with the flag 181 181 if(flag_->getCollided()){ 182 OrxoKartKart*player = flag_->getObjectofCollision();182 player = flag_->getObjectofCollision(); 183 183 if (level == 1) 184 184 player->setPosition(Vector3(s*0, 20, s*8.5)); -
code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h
r12144 r12155 42 42 #include "gametypes/Gametype.h" 43 43 #include "OrxoKartOrigin.h" 44 44 #include "OrxoKartKart.h" 45 45 namespace orxonox 46 46 { … … 61 61 62 62 private: 63 OrxoKartKart* player; 63 64 WeakPtr<OrxoKartOrigin> origin_; 64 65 OrxoKartFlag* flag_;
Note: See TracChangeset
for help on using the changeset viewer.