Changeset 11869

Timestamp:

Apr 16, 2018, 11:50:31 PM (6 years ago)

Author:

dreherm

Message:

Tes Game 4

Location:

code/branches/3DPacman_FS18/src/modules/Pacman

Files:

• Pacman.cc (modified) (4 diffs)
• Pacman.h (modified) (3 diffs)

code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.cc

@@ -37 +37 @@
 #include "PacmanGhost.h"
 #include "PacmanPointSphere.h"
+#include "Highscore.h"
 
 namespace orxonox
@@ -47 +48 @@
 
         lives = 3;
-        point = 0:
+        point = 0;
         level = 1;
         Vector3 startposplayer = Vector3(0,10,245);
@@ -77 +78 @@
         }
 
-        bool bcolli = false;
+        bcolli = false;
         for(int nrghost = 0, (nrghost<3) && (!bcolli), ++nrghost){
             bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition)
         }
-        if(collis){
+        if(bcolli){
             this->catched();
         }
@@ -137 +138 @@
     }
 
+    int Pacman::getPoints(){
+        return point;
+    }
+
 
     void Pacman::start()

code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.h

@@ -38 +38 @@
 #include "PacmanGelb.h"
 
-
 #include "core/EventIncludes.h"
 #include "core/command/Executor.h"
@@ -74 +73 @@
             void catched();
             void posreset();
-            void takePoint();
-            void getPlayer();
+            void takePoint(PacmanPointSphere* taken);
+            PacmanGelb* getPlayer();
+            int getPoints();
 
 
@@ -91 +91 @@
             PacmanGhost[] 
             Vector3 currentPosition;
+            bool bcolli = false;
 
 
             Timer endGameTimer;
-            WeakPtr<PlayerInfo> playerInfo_;
-
-            WeakPtr<DodgeRaceCenterPoint> center_;
             int level;
             int point;