[Orxonox-commit 7310] r11927 - code/branches/3DPacman_FS18/src/modules/pacman
dreherm at orxonox.net
dreherm at orxonox.net
Sun Apr 29 14:07:19 CEST 2018
Author: dreherm
Date: 2018-04-29 14:07:18 +0200 (Sun, 29 Apr 2018)
New Revision: 11927
Modified:
code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc
Log:
Disk quota test 8
Modified: code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc
===================================================================
--- code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc 2018-04-29 12:05:34 UTC (rev 11926)
+++ code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc 2018-04-29 12:07:18 UTC (rev 11927)
@@ -45,7 +45,7 @@
{
RegisterObject(PacmanGhost);
- /* this->velocity = Vector3(0, 0, 0);
+ this->velocity = Vector3(0, 0, 0);
this->setCollisionType(CollisionType::Dynamic);
@@ -54,7 +54,7 @@
this->actuelposition = this->getPosition();
this->target_x = actuelposition.x;
- this->target_z = actuelposition.z; */
+ this->target_z = actuelposition.z;
}
@@ -104,7 +104,7 @@
SUPER(PacmanGhost, tick, dt);
//setorientation
-/*
+
this->actuelposition = this->getPosition();
//Stop, if target arrived
@@ -329,7 +329,7 @@
this->resetGhost(); //Shouldn't happen...
} //End of Position table
}
-*/
+
}
void PacmanGhost::setnewTarget(int firstdec){
@@ -344,7 +344,7 @@
}
}
- void PacmanGhost::setnewTarget(int firstdec, int seconddec){ /*
+ void PacmanGhost::setnewTarget(int firstdec, int seconddec){
decision = rand()%2;
switch(decision){
case 0:
@@ -358,11 +358,11 @@
this->ismoving = true;
break;
}
- */
+
}
void PacmanGhost::setnewTarget(int firstdec, int seconddec, int thirddec){
- /*
+
decision = rand()%3;
switch(decision){
case 0:
@@ -381,11 +381,11 @@
this->ismoving = true;
break;
}
- */
+
}
void PacmanGhost::setnewTarget(int firstdec, int seconddec, int thirddec, int fourthdec){
- /*
+
decision = rand()%4;
switch(decision){
case 0:
@@ -409,7 +409,7 @@
this->ismoving = true;
break;
}
- */
+
}
@@ -424,7 +424,7 @@
}
void PacmanGhost::resetGhost(){
- /*
+
this->setPosition(this->resetposition);
this->ismoving = false;
this->actuelposition = this->getPosition();
@@ -431,6 +431,6 @@
this->target_x = actuelposition.x;
this->target_z = actuelposition.z;
- */
+
}
}
\ No newline at end of file
More information about the Orxonox-commit
mailing list