[Orxonox-commit 7259] r11874 - code/branches/3DPacman_FS18/src/modules/Pacman

[dreherm at orxonox.net]

Author: dreherm
Date: 2018-04-17 08:15:52 +0200 (Tue, 17 Apr 2018)
New Revision: 11874

Modified:
   code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.cc
   code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.h
Log:
Tes Game 10

Modified: code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.cc
===================================================================
--- code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.cc	2018-04-16 22:07:23 UTC (rev 11873)
+++ code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.cc	2018-04-17 06:15:52 UTC (rev 11874)
@@ -75,7 +75,7 @@
 
         bcolli = false;
         for(int nrghost = 0; (nrghost<3) && (!bcolli); ++nrghost){
-            bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition)
+            bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition);
         }
         if(bcolli){
             this->catched();
@@ -116,7 +116,7 @@
 
     void Pacman::takePoint(PacmanPointSphere* taken){
         ++point;
-        if(point == totallevelpoint) this->levelUp;
+        if(point == totallevelpoint) this->levelUp();
 
         Vector3 postaken = taken->getPosition();
         postaken.y = -50;
@@ -160,7 +160,7 @@
     {
         if (Highscore::exists())
         {
-            int score = this->getPoints();
+            //int score = this->getPoints();
             //Highscore::getInstance().storeScore("3DPacman", score, this->playerInfo_);
         }
         GSLevel::startMainMenu();

Modified: code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.h
===================================================================
--- code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.h	2018-04-16 22:07:23 UTC (rev 11873)
+++ code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.h	2018-04-17 06:15:52 UTC (rev 11874)
@@ -88,7 +88,7 @@
             int multiplier;
             float counter;
             int pattern;
-            float currentPosition;
+            
             float lastPosition;
 
        private:
@@ -97,6 +97,7 @@
             Vector3 currentPosition;
             bool bcolli = false;
             Vector3 startposplayer = Vector3(0,10,245);
+            int totallevelpoint = 1;
 
 
             Timer endGameTimer;