[Orxonox-commit 7302] r11919 - code/branches/3DPacman_FS18/src/modules/pacman
dreherm at orxonox.net
dreherm at orxonox.net
Sun Apr 29 13:21:26 CEST 2018
Author: dreherm
Date: 2018-04-29 13:21:26 +0200 (Sun, 29 Apr 2018)
New Revision: 11919
Modified:
code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc
code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h
Log:
Added movements 2
Modified: code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc
===================================================================
--- code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc 2018-04-28 23:38:20 UTC (rev 11918)
+++ code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc 2018-04-29 11:21:26 UTC (rev 11919)
@@ -74,8 +74,6 @@
void PacmanGhost::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
SUPER(PacmanGhost, XMLPort, xmlelement, mode);
-
- XMLPortParam(PacmanGhost, "resetposition", setResetPosition, getResetPosition, xmlelement, mode);
}
Modified: code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h
===================================================================
--- code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h 2018-04-28 23:38:20 UTC (rev 11918)
+++ code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h 2018-04-29 11:21:26 UTC (rev 11919)
@@ -56,16 +56,9 @@
void setnewTarget(int firstdec, int seconddec, int thirddec, int fourthdec);
- bool findpos(Vector3 one, Vector3 other);
+ bool findpos(Vector3 one, Vector3 other);
- inline void setResetPosition(Vector3 rpos)
- { this->resetposition = rpos; }
-
- inline Vector3 getResetPosition()
- { return this->resetposition; }
-
-
private:
bool ismoving = false;
int decision = 0; //Gives the random which way information to the ghost.
More information about the Orxonox-commit
mailing list