Changeset 11869
- Timestamp:
- Apr 16, 2018, 11:50:31 PM (7 years ago)
- Location:
- code/branches/3DPacman_FS18/src/modules/Pacman
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.cc
r11868 r11869 37 37 #include "PacmanGhost.h" 38 38 #include "PacmanPointSphere.h" 39 #include "Highscore.h" 39 40 40 41 namespace orxonox … … 47 48 48 49 lives = 3; 49 point = 0 :50 point = 0; 50 51 level = 1; 51 52 Vector3 startposplayer = Vector3(0,10,245); … … 77 78 } 78 79 79 b ool bcolli = false;80 bcolli = false; 80 81 for(int nrghost = 0, (nrghost<3) && (!bcolli), ++nrghost){ 81 82 bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition) 82 83 } 83 if( collis){84 if(bcolli){ 84 85 this->catched(); 85 86 } … … 137 138 } 138 139 140 int Pacman::getPoints(){ 141 return point; 142 } 143 139 144 140 145 void Pacman::start() -
code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.h
r11868 r11869 38 38 #include "PacmanGelb.h" 39 39 40 41 40 #include "core/EventIncludes.h" 42 41 #include "core/command/Executor.h" … … 74 73 void catched(); 75 74 void posreset(); 76 void takePoint(); 77 void getPlayer(); 75 void takePoint(PacmanPointSphere* taken); 76 PacmanGelb* getPlayer(); 77 int getPoints(); 78 78 79 79 … … 91 91 PacmanGhost[] 92 92 Vector3 currentPosition; 93 bool bcolli = false; 93 94 94 95 95 96 Timer endGameTimer; 96 WeakPtr<PlayerInfo> playerInfo_;97 98 WeakPtr<DodgeRaceCenterPoint> center_;99 97 int level; 100 98 int point;
Note: See TracChangeset
for help on using the changeset viewer.