Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11869


Ignore:
Timestamp:
Apr 16, 2018, 11:50:31 PM (7 years ago)
Author:
dreherm
Message:

Tes Game 4

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  
    3737#include "PacmanGhost.h"
    3838#include "PacmanPointSphere.h"
     39#include "Highscore.h"
    3940
    4041namespace orxonox
     
    4748
    4849        lives = 3;
    49         point = 0:
     50        point = 0;
    5051        level = 1;
    5152        Vector3 startposplayer = Vector3(0,10,245);
     
    7778        }
    7879
    79         bool bcolli = false;
     80        bcolli = false;
    8081        for(int nrghost = 0, (nrghost<3) && (!bcolli), ++nrghost){
    8182            bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition)
    8283        }
    83         if(collis){
     84        if(bcolli){
    8485            this->catched();
    8586        }
     
    137138    }
    138139
     140    int Pacman::getPoints(){
     141        return point;
     142    }
     143
    139144
    140145    void Pacman::start()
  • code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.h

    r11868 r11869  
    3838#include "PacmanGelb.h"
    3939
    40 
    4140#include "core/EventIncludes.h"
    4241#include "core/command/Executor.h"
     
    7473            void catched();
    7574            void posreset();
    76             void takePoint();
    77             void getPlayer();
     75            void takePoint(PacmanPointSphere* taken);
     76            PacmanGelb* getPlayer();
     77            int getPoints();
    7878
    7979
     
    9191            PacmanGhost[]
    9292            Vector3 currentPosition;
     93            bool bcolli = false;
    9394
    9495
    9596            Timer endGameTimer;
    96             WeakPtr<PlayerInfo> playerInfo_;
    97 
    98             WeakPtr<DodgeRaceCenterPoint> center_;
    9997            int level;
    10098            int point;
Note: See TracChangeset for help on using the changeset viewer.