Changeset 12408 for code/branches/Presentation_FS19/src/modules/pacman/Pacman.cc

Timestamp:

May 22, 2019, 1:58:40 PM (6 years ago)

Author:

wiesep

Message:

Merged 3DPacman_FS19

Location:

code/branches/Presentation_FS19

Files:

• . (modified) (1 prop)
• src/modules/pacman/Pacman.cc (modified) (7 diffs)

code/branches/Presentation_FS19/src/modules/pacman/Pacman.cc

@@ -39 +39 @@
     RegisterClass(Pacman);
 
+    int PACMAN_INTERNAL_PACMAN_POSITION;
+
     Pacman::Pacman(Context* context) : Deathmatch(context)
     {
@@ -46 +48 @@
         point = 0;
         level = 1;
+        laser = 5; //after that number of eaten pointSpheres, the laser appears
 
     }
@@ -56 +59 @@
         }
 
+        
+        PacmanLaser* pos = *(ObjectList<PacmanLaser>().begin());
+        pos->resetPacmanLaser();
+
+
+
         for(PacmanPointAfraid* next : ObjectList<PacmanPointAfraid>()){
             next->resetPacmanPointAfraid();
@@ -73 +82 @@
 
 
-    PacmanGhost* ghosts[4];
+    PacmanGhost* ghosts[8];
 
 
     void Pacman::tick(float dt)
     {
+
         SUPER(Pacman, tick, dt);
+
 
         //Needed for gameover
         if(deathtime != 0){
             dead(dt);
+
+
+         
         }
 
@@ -88 +102 @@
         else{
 
+            //support by laser
+            if(point > laser + 240*(level-1)){
+              
+                for(PacmanPointSphere* pointer : ObjectList<PacmanPointSphere>()){
+                    Vector3 pointSpherePosition = pointer->getPosition();
+
+                     if(pointSpherePosition.y > 0){// pointSphere above surface =not eaten yet
+
+                        PacmanLaser* pos = *(ObjectList<PacmanLaser>().begin());
+                        pos->setPosition(pointSpherePosition);
+                        break;
+                    }
+
+
+                }
+
+            }
+
             //Register ghosts
             int i = 0;
-            for(PacmanGhost* nextghost : ObjectList<PacmanGhost>()){
+            for(PacmanGhost* nextghost: ObjectList<PacmanGhost>()){
                 ghosts[i] = nextghost;
                 i++;
             }
-
             //Switch ghost to not-catchable, if timer is zero
             if(afraid){
@@ -137 +168 @@
     //Check for collisions between to objects (compare float numbers)
     bool Pacman::collis(Vector3 one, Vector3 other){
-        if((abs(one.x-other.x)<10) && (abs(one.y-other.y)<10) && (abs(one.z-other.z)<10))
+        if((abs(one.x-other.x)<19) && (abs(one.y-other.y)<10) && (abs(one.z-other.z)<19))
             return true;
         return false;
@@ -203 +234 @@
     void Pacman::takePoint(PacmanPointSphere* taken){
         ++point;
+        
         if(point == totallevelpoint){ 
             this->levelUp();