Changeset 11915 for code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc

Timestamp:

Apr 26, 2018, 4:11:19 PM (6 years ago)

Author:

dreherm

Message:

Game playable

File:

• code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) (8 diffs)

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

@@ -38 +38 @@
 namespace orxonox
 {
-    RegisterUnloadableClass(Pacman);
+    RegisterClass(Pacman);
 
     Pacman::Pacman(Context* context) : Deathmatch(context)
@@ -44 +44 @@
         RegisterObject(Pacman);
 
-        lives = 3;
+        lives = 10;
         point = 0;
         level = 1;
@@ -57 +57 @@
 
     PacmanGhost* ghosts[4];
-    PacmanPointSphere* spheres[1];
 
 
     void Pacman::tick(float dt)
     {
+        SUPER(Pacman, tick, dt);
+
         int i = 0;
         for(PacmanGhost* nextghost : ObjectList<PacmanGhost>()){
@@ -74 +75 @@
         }
 
+
         bcolli = false;
         for(int nrghost = 0; (nrghost<3) && (!bcolli); ++nrghost){
             bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition);
+            //orxout() << "GHOST" << nrghost << ghosts[nrghost]->getPosition() << endl;
         }
+
         if(bcolli){
-            this->catched();
+          this->catched();
         }
 
@@ -89 +93 @@
         }
 
-        SUPER(Pacman, tick, dt);
-
     }
 
 
     bool Pacman::collis(Vector3 one, Vector3 other){
-        if((abs(one.x-other.x)<0.1) && (abs(one.x-other.x)<0.1) && (abs(one.x-other.x)<0.1))
+        if((abs(one.x-other.x)<7) && (abs(one.y-other.y)<7) && (abs(one.z-other.z)<7))
             return true;
         return false;
@@ -107 +109 @@
 
     void Pacman::posreset(){
-        int i = 0;
         for(PacmanGhost* nextghost : ObjectList<PacmanGhost>()){
             nextghost->resetGhost();
-            i++;
         }
         player->setPosition(startposplayer);
@@ -118 +118 @@
         ++point;
         if(point == totallevelpoint) this->levelUp();
-
         Vector3 postaken = taken->getPosition();
         postaken.y = -50;
@@ -141 +140 @@
     void Pacman::start()
     {
-        orxout() << "start" << endl;
-        
         Deathmatch::start();
-    }
-
-    void Pacman::playerPreSpawn(PlayerInfo* player)
-    {
-        //PlayerInfo* playerInfo_;
-        //this->playerInfo_ = player;
-        if(lives <= 0)
-        {
-            this->end();
-        }
     }