[Orxonox-commit 530] r3078 - in trunk/src/orxonox: objects/controllers objects/pickup/items objects/quest objects/worldentities overlays overlays/hud overlays/notifications sound
landauf at orxonox.net
landauf at orxonox.net
Mon May 25 23:49:43 CEST 2009
Author: landauf
Date: 2009-05-25 23:49:42 +0200 (Mon, 25 May 2009)
New Revision: 3078
Modified:
trunk/src/orxonox/objects/controllers/WaypointController.cc
trunk/src/orxonox/objects/controllers/WaypointController.h
trunk/src/orxonox/objects/controllers/WaypointPatrolController.cc
trunk/src/orxonox/objects/controllers/WaypointPatrolController.h
trunk/src/orxonox/objects/pickup/items/CMakeLists.txt
trunk/src/orxonox/objects/pickup/items/HealthImmediate.cc
trunk/src/orxonox/objects/pickup/items/HealthImmediate.h
trunk/src/orxonox/objects/pickup/items/HealthUsable.cc
trunk/src/orxonox/objects/pickup/items/HealthUsable.h
trunk/src/orxonox/objects/pickup/items/Jump.cc
trunk/src/orxonox/objects/pickup/items/Jump.h
trunk/src/orxonox/objects/quest/QuestNotification.cc
trunk/src/orxonox/objects/quest/QuestNotification.h
trunk/src/orxonox/objects/worldentities/Attacher.cc
trunk/src/orxonox/objects/worldentities/Attacher.h
trunk/src/orxonox/overlays/GUIOverlay.cc
trunk/src/orxonox/overlays/GUIOverlay.h
trunk/src/orxonox/overlays/hud/PongScore.cc
trunk/src/orxonox/overlays/hud/PongScore.h
trunk/src/orxonox/overlays/notifications/NotificationOverlay.cc
trunk/src/orxonox/overlays/notifications/NotificationOverlay.h
trunk/src/orxonox/sound/CMakeLists.txt
trunk/src/orxonox/sound/SoundBase.cc
trunk/src/orxonox/sound/SoundBase.h
trunk/src/orxonox/sound/SoundMainMenu.cc
trunk/src/orxonox/sound/SoundMainMenu.h
trunk/src/orxonox/sound/SoundManager.cc
trunk/src/orxonox/sound/SoundManager.h
Log:
added svn:eolstyle native, no codechanges
Modified: trunk/src/orxonox/objects/controllers/WaypointController.cc
===================================================================
--- trunk/src/orxonox/objects/controllers/WaypointController.cc 2009-05-25 21:16:27 UTC (rev 3077)
+++ trunk/src/orxonox/objects/controllers/WaypointController.cc 2009-05-25 21:49:42 UTC (rev 3078)
@@ -1,90 +1,90 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Fabian 'x3n' Landau
- * Co-authors:
- * ...
- *
- */
-
-#include "OrxonoxStableHeaders.h"
-#include "WaypointController.h"
-
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-
-namespace orxonox
-{
- CreateFactory(WaypointController);
-
- WaypointController::WaypointController(BaseObject* creator) : ArtificialController(creator)
- {
- RegisterObject(WaypointController);
-
- this->currentWaypoint_ = 0;
- this->setAccuracy(100);
- }
-
- WaypointController::~WaypointController()
- {
- if (this->isInitialized())
- {
- for (size_t i = 0; i < this->waypoints_.size(); ++i)
- delete this->waypoints_[i];
- }
- }
-
- void WaypointController::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(WaypointController, XMLPort, xmlelement, mode);
-
- XMLPortParam(WaypointController, "accuracy", setAccuracy, getAccuracy, xmlelement, mode).defaultValues(100.0f);
- XMLPortObject(WaypointController, WorldEntity, "waypoints", addWaypoint, getWaypoint, xmlelement, mode);
- }
-
- void WaypointController::tick(float dt)
- {
- if (!this->isActive())
- return;
-
- if (this->waypoints_.size() == 0 || !this->getControllableEntity())
- return;
-
- if (this->waypoints_[this->currentWaypoint_]->getWorldPosition().squaredDistance(this->getControllableEntity()->getPosition()) <= this->squaredaccuracy_)
- this->currentWaypoint_ = (this->currentWaypoint_ + 1) % this->waypoints_.size();
-
- this->moveToPosition(this->waypoints_[this->currentWaypoint_]->getWorldPosition());
- }
-
- void WaypointController::addWaypoint(WorldEntity* waypoint)
- {
- this->waypoints_.push_back(waypoint);
- }
-
- WorldEntity* WaypointController::getWaypoint(unsigned int index) const
- {
- if (index < this->waypoints_.size())
- return this->waypoints_[index];
- else
- return 0;
- }
-}
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+#include "WaypointController.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+
+namespace orxonox
+{
+ CreateFactory(WaypointController);
+
+ WaypointController::WaypointController(BaseObject* creator) : ArtificialController(creator)
+ {
+ RegisterObject(WaypointController);
+
+ this->currentWaypoint_ = 0;
+ this->setAccuracy(100);
+ }
+
+ WaypointController::~WaypointController()
+ {
+ if (this->isInitialized())
+ {
+ for (size_t i = 0; i < this->waypoints_.size(); ++i)
+ delete this->waypoints_[i];
+ }
+ }
+
+ void WaypointController::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(WaypointController, XMLPort, xmlelement, mode);
+
+ XMLPortParam(WaypointController, "accuracy", setAccuracy, getAccuracy, xmlelement, mode).defaultValues(100.0f);
+ XMLPortObject(WaypointController, WorldEntity, "waypoints", addWaypoint, getWaypoint, xmlelement, mode);
+ }
+
+ void WaypointController::tick(float dt)
+ {
+ if (!this->isActive())
+ return;
+
+ if (this->waypoints_.size() == 0 || !this->getControllableEntity())
+ return;
+
+ if (this->waypoints_[this->currentWaypoint_]->getWorldPosition().squaredDistance(this->getControllableEntity()->getPosition()) <= this->squaredaccuracy_)
+ this->currentWaypoint_ = (this->currentWaypoint_ + 1) % this->waypoints_.size();
+
+ this->moveToPosition(this->waypoints_[this->currentWaypoint_]->getWorldPosition());
+ }
+
+ void WaypointController::addWaypoint(WorldEntity* waypoint)
+ {
+ this->waypoints_.push_back(waypoint);
+ }
+
+ WorldEntity* WaypointController::getWaypoint(unsigned int index) const
+ {
+ if (index < this->waypoints_.size())
+ return this->waypoints_[index];
+ else
+ return 0;
+ }
+}
Property changes on: trunk/src/orxonox/objects/controllers/WaypointController.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/src/orxonox/objects/controllers/WaypointController.h
===================================================================
--- trunk/src/orxonox/objects/controllers/WaypointController.h 2009-05-25 21:16:27 UTC (rev 3077)
+++ trunk/src/orxonox/objects/controllers/WaypointController.h 2009-05-25 21:49:42 UTC (rev 3078)
@@ -1,65 +1,65 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Fabian 'x3n' Landau
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _WaypointController_H__
-#define _WaypointController_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include <vector>
-
-#include "ArtificialController.h"
-#include "objects/Tickable.h"
-
-namespace orxonox
-{
- class _OrxonoxExport WaypointController : public ArtificialController, public Tickable
- {
- public:
- WaypointController(BaseObject* creator);
- virtual ~WaypointController();
-
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
-
- void addWaypoint(WorldEntity* waypoint);
- WorldEntity* getWaypoint(unsigned int index) const;
-
- inline void setAccuracy(float accuracy)
- { this->squaredaccuracy_ = accuracy*accuracy; }
- inline float getAccuracy() const
- { return sqrt(this->squaredaccuracy_); }
-
- protected:
- std::vector<WorldEntity*> waypoints_;
- size_t currentWaypoint_;
- float squaredaccuracy_;
- };
-}
-
-#endif /* _WaypointController_H__ */
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _WaypointController_H__
+#define _WaypointController_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include <vector>
+
+#include "ArtificialController.h"
+#include "objects/Tickable.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport WaypointController : public ArtificialController, public Tickable
+ {
+ public:
+ WaypointController(BaseObject* creator);
+ virtual ~WaypointController();
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void tick(float dt);
+
+ void addWaypoint(WorldEntity* waypoint);
+ WorldEntity* getWaypoint(unsigned int index) const;
+
+ inline void setAccuracy(float accuracy)
+ { this->squaredaccuracy_ = accuracy*accuracy; }
+ inline float getAccuracy() const
+ { return sqrt(this->squaredaccuracy_); }
+
+ protected:
+ std::vector<WorldEntity*> waypoints_;
+ size_t currentWaypoint_;
+ float squaredaccuracy_;
+ };
+}
+
+#endif /* _WaypointController_H__ */
Property changes on: trunk/src/orxonox/objects/controllers/WaypointController.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/src/orxonox/objects/controllers/WaypointPatrolController.cc
===================================================================
--- trunk/src/orxonox/objects/controllers/WaypointPatrolController.cc 2009-05-25 21:16:27 UTC (rev 3077)
+++ trunk/src/orxonox/objects/controllers/WaypointPatrolController.cc 2009-05-25 21:49:42 UTC (rev 3078)
@@ -1,104 +1,104 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Fabian 'x3n' Landau
- * Co-authors:
- * ...
- *
- */
-
-#include "OrxonoxStableHeaders.h"
-#include "WaypointPatrolController.h"
-
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-
-namespace orxonox
-{
- CreateFactory(WaypointPatrolController);
-
- WaypointPatrolController::WaypointPatrolController(BaseObject* creator) : WaypointController(creator)
- {
- RegisterObject(WaypointPatrolController);
-
- this->team_ = 0;
- this->alertnessradius_ = 500;
-
- this->patrolTimer_.setTimer(rnd(), true, this, createExecutor(createFunctor(&WaypointPatrolController::searchEnemy)));
- }
-
- void WaypointPatrolController::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(WaypointPatrolController, XMLPort, xmlelement, mode);
-
- XMLPortParam(WaypointPatrolController, "alertnessradius", setAlertnessRadius, getAlertnessRadius, xmlelement, mode).defaultValues(500.0f);
- XMLPortParam(WaypointPatrolController, "team", setTeam, getTeam, xmlelement, mode).defaultValues(0);
- }
-
- void WaypointPatrolController::tick(float dt)
- {
- if (!this->isActive())
- return;
-
- if (this->target_)
- {
- this->aimAtTarget();
-
- if (this->bHasTargetPosition_)
- this->moveToTargetPosition();
-
- if (this->getControllableEntity() && this->isCloseAtTarget(1000) && this->isLookingAtTarget(Ogre::Math::PI / 20.0))
- this->getControllableEntity()->fire(0);
- }
- else
- {
- SUPER(WaypointPatrolController, tick, dt);
- }
- }
-
- void WaypointPatrolController::searchEnemy()
- {
- this->patrolTimer_.setInterval(rnd());
-
- if (!this->getControllableEntity())
- return;
-
- Vector3 myposition = this->getControllableEntity()->getPosition();
- float shortestsqdistance = (unsigned int)-1;
-
- for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
- {
- if (ArtificialController::sameTeam(this->getControllableEntity(), static_cast<ControllableEntity*>(*it), this->getGametype()))
- continue;
-
- float sqdistance = it->getPosition().squaredDistance(myposition);
- if (sqdistance < shortestsqdistance)
- {
- shortestsqdistance = sqdistance;
- this->target_ = (*it);
- }
- }
-
- if (shortestsqdistance > (this->alertnessradius_ * this->alertnessradius_))
- this->target_ = 0;
- }
-}
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+#include "WaypointPatrolController.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+
+namespace orxonox
+{
+ CreateFactory(WaypointPatrolController);
+
+ WaypointPatrolController::WaypointPatrolController(BaseObject* creator) : WaypointController(creator)
+ {
+ RegisterObject(WaypointPatrolController);
+
+ this->team_ = 0;
+ this->alertnessradius_ = 500;
+
+ this->patrolTimer_.setTimer(rnd(), true, this, createExecutor(createFunctor(&WaypointPatrolController::searchEnemy)));
+ }
+
+ void WaypointPatrolController::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(WaypointPatrolController, XMLPort, xmlelement, mode);
+
+ XMLPortParam(WaypointPatrolController, "alertnessradius", setAlertnessRadius, getAlertnessRadius, xmlelement, mode).defaultValues(500.0f);
+ XMLPortParam(WaypointPatrolController, "team", setTeam, getTeam, xmlelement, mode).defaultValues(0);
+ }
+
+ void WaypointPatrolController::tick(float dt)
+ {
+ if (!this->isActive())
+ return;
+
+ if (this->target_)
+ {
+ this->aimAtTarget();
+
+ if (this->bHasTargetPosition_)
+ this->moveToTargetPosition();
+
+ if (this->getControllableEntity() && this->isCloseAtTarget(1000) && this->isLookingAtTarget(Ogre::Math::PI / 20.0))
+ this->getControllableEntity()->fire(0);
+ }
+ else
+ {
+ SUPER(WaypointPatrolController, tick, dt);
+ }
+ }
+
+ void WaypointPatrolController::searchEnemy()
+ {
+ this->patrolTimer_.setInterval(rnd());
+
+ if (!this->getControllableEntity())
+ return;
+
+ Vector3 myposition = this->getControllableEntity()->getPosition();
+ float shortestsqdistance = (unsigned int)-1;
+
+ for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
+ {
+ if (ArtificialController::sameTeam(this->getControllableEntity(), static_cast<ControllableEntity*>(*it), this->getGametype()))
+ continue;
+
+ float sqdistance = it->getPosition().squaredDistance(myposition);
+ if (sqdistance < shortestsqdistance)
+ {
+ shortestsqdistance = sqdistance;
+ this->target_ = (*it);
+ }
+ }
+
+ if (shortestsqdistance > (this->alertnessradius_ * this->alertnessradius_))
+ this->target_ = 0;
+ }
+}
Property changes on: trunk/src/orxonox/objects/controllers/WaypointPatrolController.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/src/orxonox/objects/controllers/WaypointPatrolController.h
===================================================================
--- trunk/src/orxonox/objects/controllers/WaypointPatrolController.h 2009-05-25 21:16:27 UTC (rev 3077)
+++ trunk/src/orxonox/objects/controllers/WaypointPatrolController.h 2009-05-25 21:49:42 UTC (rev 3078)
@@ -1,67 +1,67 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Fabian 'x3n' Landau
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _WaypointPatrolController_H__
-#define _WaypointPatrolController_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include "WaypointController.h"
-#include "tools/Timer.h"
-
-namespace orxonox
-{
- class _OrxonoxExport WaypointPatrolController : public WaypointController
- {
- public:
- WaypointPatrolController(BaseObject* creator);
- virtual ~WaypointPatrolController() {}
-
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
-
- inline void setTeam(int team)
- { this->team_ = team; }
- inline int getTeam() const
- { return this->team_; }
-
- inline void setAlertnessRadius(float radius)
- { this->alertnessradius_ = radius; }
- inline float getAlertnessRadius() const
- { return this->alertnessradius_; }
-
- protected:
- void searchEnemy();
-
- int team_;
- float alertnessradius_;
- Timer<WaypointPatrolController> patrolTimer_;
- };
-}
-
-#endif /* _WaypointPatrolController_H__ */
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _WaypointPatrolController_H__
+#define _WaypointPatrolController_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "WaypointController.h"
+#include "tools/Timer.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport WaypointPatrolController : public WaypointController
+ {
+ public:
+ WaypointPatrolController(BaseObject* creator);
+ virtual ~WaypointPatrolController() {}
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void tick(float dt);
+
+ inline void setTeam(int team)
+ { this->team_ = team; }
+ inline int getTeam() const
+ { return this->team_; }
+
+ inline void setAlertnessRadius(float radius)
+ { this->alertnessradius_ = radius; }
+ inline float getAlertnessRadius() const
+ { return this->alertnessradius_; }
+
+ protected:
+ void searchEnemy();
+
+ int team_;
+ float alertnessradius_;
+ Timer<WaypointPatrolController> patrolTimer_;
+ };
+}
+
+#endif /* _WaypointPatrolController_H__ */
Property changes on: trunk/src/orxonox/objects/controllers/WaypointPatrolController.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/src/orxonox/objects/pickup/items/CMakeLists.txt
===================================================================
--- trunk/src/orxonox/objects/pickup/items/CMakeLists.txt 2009-05-25 21:16:27 UTC (rev 3077)
+++ trunk/src/orxonox/objects/pickup/items/CMakeLists.txt 2009-05-25 21:49:42 UTC (rev 3078)
@@ -1,5 +1,5 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
- HealthImmediate.cc
- HealthUsable.cc
- Jump.cc
-)
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ HealthImmediate.cc
+ HealthUsable.cc
+ Jump.cc
+)
Property changes on: trunk/src/orxonox/objects/pickup/items/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/src/orxonox/objects/pickup/items/HealthImmediate.cc
===================================================================
--- trunk/src/orxonox/objects/pickup/items/HealthImmediate.cc 2009-05-25 21:16:27 UTC (rev 3077)
+++ trunk/src/orxonox/objects/pickup/items/HealthImmediate.cc 2009-05-25 21:49:42 UTC (rev 3078)
@@ -1,76 +1,76 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Daniel 'Huty' Haggenmueller
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file
- @brief Implementation of HealthImmediate.
-*/
-
-#include "HealthImmediate.h"
-
-#include "objects/worldentities/pawns/Pawn.h"
-
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-#include "core/Core.h"
-
-namespace orxonox
-{
- CreateFactory(HealthImmediate);
-
- HealthImmediate::HealthImmediate(BaseObject* creator) : PassiveItem(creator)
- {
- RegisterObject(HealthImmediate);
-
- this->recoveredHealth_ = 0;
- }
- HealthImmediate::~HealthImmediate()
- {
- }
-
- void HealthImmediate::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(HealthImmediate, XMLPort, xmlelement, mode);
-
- XMLPortParam(HealthImmediate, "recoveredHealth", setRecoveredHealth, getRecoveredHealth, xmlelement, mode);
- }
-
- bool HealthImmediate::pickedUp(Pawn* pawn)
- {
- float maxH = pawn->getMaxHealth();
- float curH = pawn->getHealth();
-
- if (curH < maxH)
- {
- pawn->addHealth(this->recoveredHealth_);
- delete this;
- }
-
- return (curH < maxH);
- }
-}
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Implementation of HealthImmediate.
+*/
+
+#include "HealthImmediate.h"
+
+#include "objects/worldentities/pawns/Pawn.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "core/Core.h"
+
+namespace orxonox
+{
+ CreateFactory(HealthImmediate);
+
+ HealthImmediate::HealthImmediate(BaseObject* creator) : PassiveItem(creator)
+ {
+ RegisterObject(HealthImmediate);
+
+ this->recoveredHealth_ = 0;
+ }
+ HealthImmediate::~HealthImmediate()
+ {
+ }
+
+ void HealthImmediate::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(HealthImmediate, XMLPort, xmlelement, mode);
+
+ XMLPortParam(HealthImmediate, "recoveredHealth", setRecoveredHealth, getRecoveredHealth, xmlelement, mode);
+ }
+
+ bool HealthImmediate::pickedUp(Pawn* pawn)
+ {
+ float maxH = pawn->getMaxHealth();
+ float curH = pawn->getHealth();
+
+ if (curH < maxH)
+ {
+ pawn->addHealth(this->recoveredHealth_);
+ delete this;
+ }
+
+ return (curH < maxH);
+ }
+}
Property changes on: trunk/src/orxonox/objects/pickup/items/HealthImmediate.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/src/orxonox/objects/pickup/items/HealthImmediate.h
===================================================================
--- trunk/src/orxonox/objects/pickup/items/HealthImmediate.h 2009-05-25 21:16:27 UTC (rev 3077)
+++ trunk/src/orxonox/objects/pickup/items/HealthImmediate.h 2009-05-25 21:49:42 UTC (rev 3078)
@@ -1,68 +1,68 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Daniel 'Huty' Haggenmueller
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file
- @brief Definition of HealthImmediate.
-*/
-
-#ifndef _HealthImmediate_H__
-#define _HealthImmediate_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include "../PassiveItem.h"
-
-namespace orxonox
-{
- class Pawn;
-
- /**
- @brief Health-item, immediatly recovers health when picked up.
- */
- class _OrxonoxExport HealthImmediate : public PassiveItem
- {
- public:
- HealthImmediate(BaseObject* creator);
- virtual ~HealthImmediate();
-
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
- virtual bool pickedUp(Pawn* pawn);
-
- inline float getRecoveredHealth() const
- { return this->recoveredHealth_; }
- inline void setRecoveredHealth(float recovery)
- { this->recoveredHealth_ = recovery; }
-
- private:
- float recoveredHealth_;
- };
-}
-
-#endif /* _HealthImmediate_H__ */
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Definition of HealthImmediate.
+*/
+
+#ifndef _HealthImmediate_H__
+#define _HealthImmediate_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "../PassiveItem.h"
+
+namespace orxonox
+{
+ class Pawn;
+
+ /**
+ @brief Health-item, immediatly recovers health when picked up.
+ */
+ class _OrxonoxExport HealthImmediate : public PassiveItem
+ {
+ public:
+ HealthImmediate(BaseObject* creator);
+ virtual ~HealthImmediate();
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+
+ virtual bool pickedUp(Pawn* pawn);
+
+ inline float getRecoveredHealth() const
+ { return this->recoveredHealth_; }
+ inline void setRecoveredHealth(float recovery)
+ { this->recoveredHealth_ = recovery; }
+
+ private:
+ float recoveredHealth_;
+ };
+}
+
+#endif /* _HealthImmediate_H__ */
Property changes on: trunk/src/orxonox/objects/pickup/items/HealthImmediate.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/src/orxonox/objects/pickup/items/HealthUsable.cc
===================================================================
--- trunk/src/orxonox/objects/pickup/items/HealthUsable.cc 2009-05-25 21:16:27 UTC (rev 3077)
+++ trunk/src/orxonox/objects/pickup/items/HealthUsable.cc 2009-05-25 21:49:42 UTC (rev 3078)
@@ -1,105 +1,105 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Daniel 'Huty' Haggenmueller
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file
- @brief Implementation of HealthUsable.
-*/
-
-#include "HealthUsable.h"
-#include "../DroppedItem.h"
-
-#include "objects/worldentities/pawns/Pawn.h"
-
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-#include "core/Core.h"
-
-namespace orxonox
-{
- CreateFactory(HealthUsable);
-
- /**
- @brief Constructor
- @param creator Object that created this item.
- */
- HealthUsable::HealthUsable(BaseObject* creator) : UsableItem(creator)
- {
- RegisterObject(HealthUsable);
-
- this->recoveredHealth_ = 0;
- }
- //! Deconstructor
- HealthUsable::~HealthUsable()
- {
- }
- /**
- @brief XMLPort for Jump.
- @param xmlelement Element of the XML-file.
- @param mode XMLPort mode to use.
- */
- void HealthUsable::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(HealthUsable, XMLPort, xmlelement, mode);
-
- XMLPortParam(HealthUsable, "recoveredHealth", setRecoveredHealth, getRecoveredHealth, xmlelement, mode);
- }
- /**
- @brief Called when the item is used, makes the user "jump".
- @param pawn Pawn which used te item.
- */
- void HealthUsable::used(Pawn* pawn)
- {
- float maxH = pawn->getMaxHealth();
- float curH = pawn->getHealth();
-
- if (curH < maxH) {
- pawn->addHealth(this->recoveredHealth_);
-
- this->removeFrom(pawn);
- delete this;
- }
- }
- /**
- @brief Called when the item is picked up.
- @param pawn Pawn which picked up the item.
- */
- bool HealthUsable::pickedUp(Pawn* pawn)
- {
- return this->addTo(pawn);
- }
- /**
- @brief Called when the item is dropped, creates a DroppedItem behind the pawn.
- @param pawn Pawn which dropped the item.
- */
- bool HealthUsable::dropped(Pawn* pawn)
- {
- DroppedItem::createDefaultDrop(this, pawn, ColourValue(1.0f, 0.0f, 0.0f), 30.0f);
- return this->removeFrom(pawn);
- }
-}
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Implementation of HealthUsable.
+*/
+
+#include "HealthUsable.h"
+#include "../DroppedItem.h"
+
+#include "objects/worldentities/pawns/Pawn.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "core/Core.h"
+
+namespace orxonox
+{
+ CreateFactory(HealthUsable);
+
+ /**
+ @brief Constructor
+ @param creator Object that created this item.
+ */
+ HealthUsable::HealthUsable(BaseObject* creator) : UsableItem(creator)
+ {
+ RegisterObject(HealthUsable);
+
+ this->recoveredHealth_ = 0;
+ }
+ //! Deconstructor
+ HealthUsable::~HealthUsable()
+ {
+ }
+ /**
+ @brief XMLPort for Jump.
+ @param xmlelement Element of the XML-file.
+ @param mode XMLPort mode to use.
+ */
+ void HealthUsable::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(HealthUsable, XMLPort, xmlelement, mode);
+
+ XMLPortParam(HealthUsable, "recoveredHealth", setRecoveredHealth, getRecoveredHealth, xmlelement, mode);
+ }
+ /**
+ @brief Called when the item is used, makes the user "jump".
+ @param pawn Pawn which used te item.
+ */
+ void HealthUsable::used(Pawn* pawn)
+ {
+ float maxH = pawn->getMaxHealth();
+ float curH = pawn->getHealth();
+
+ if (curH < maxH) {
+ pawn->addHealth(this->recoveredHealth_);
+
+ this->removeFrom(pawn);
+ delete this;
+ }
+ }
+ /**
+ @brief Called when the item is picked up.
+ @param pawn Pawn which picked up the item.
+ */
+ bool HealthUsable::pickedUp(Pawn* pawn)
+ {
+ return this->addTo(pawn);
+ }
+ /**
+ @brief Called when the item is dropped, creates a DroppedItem behind the pawn.
+ @param pawn Pawn which dropped the item.
+ */
+ bool HealthUsable::dropped(Pawn* pawn)
+ {
+ DroppedItem::createDefaultDrop(this, pawn, ColourValue(1.0f, 0.0f, 0.0f), 30.0f);
+ return this->removeFrom(pawn);
+ }
+}
Property changes on: trunk/src/orxonox/objects/pickup/items/HealthUsable.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/src/orxonox/objects/pickup/items/HealthUsable.h
===================================================================
--- trunk/src/orxonox/objects/pickup/items/HealthUsable.h 2009-05-25 21:16:27 UTC (rev 3077)
+++ trunk/src/orxonox/objects/pickup/items/HealthUsable.h 2009-05-25 21:49:42 UTC (rev 3078)
@@ -1,82 +1,82 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Daniel 'Huty' Haggenmueller
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file
- @brief Definition of HealthUsable.
-*/
-
-#ifndef _HealthUsable_H__
-#define _HealthUsable_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include "../UsableItem.h"
-#include "util/Math.h"
-
-namespace orxonox
-{
- class Pawn;
-
- /**
- @brief Health-item, enables player recover health when used.
- */
- class _OrxonoxExport HealthUsable : public UsableItem
- {
- public:
- HealthUsable(BaseObject* creator); //!< Constructor
- virtual ~HealthUsable(); //!< Deconstructor
-
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< XMLPort
-
- virtual int getMaxCarryAmount() const
- { return INT_MAX; }
-
- virtual void used(Pawn* pawn); //!< Called when the item is used.
-
- virtual bool pickedUp(Pawn* pawn); //!< Called when the item is picked up.
- virtual bool dropped(Pawn* pawn); //!< Called when the item is dropped.
-
- /**
- @brief Get the amount of jumps available.
- @return Returns how many times the item can be used.
- */
- inline float getRecoveredHealth() const
- { return this->recoveredHealth_; }
- /**
- @brief Set the amount of jumps available.
- @param num New number of available jumps.
- */
- inline void setRecoveredHealth(float recovery)
- { this->recoveredHealth_ = recovery; }
- private:
- float recoveredHealth_; //!< Amount of jumps still available.
- };
-}
-
-#endif /* _HealthUsable_H__ */
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Definition of HealthUsable.
+*/
+
+#ifndef _HealthUsable_H__
+#define _HealthUsable_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "../UsableItem.h"
+#include "util/Math.h"
+
+namespace orxonox
+{
+ class Pawn;
+
+ /**
+ @brief Health-item, enables player recover health when used.
+ */
+ class _OrxonoxExport HealthUsable : public UsableItem
+ {
+ public:
+ HealthUsable(BaseObject* creator); //!< Constructor
+ virtual ~HealthUsable(); //!< Deconstructor
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< XMLPort
+
+ virtual int getMaxCarryAmount() const
+ { return INT_MAX; }
+
+ virtual void used(Pawn* pawn); //!< Called when the item is used.
+
+ virtual bool pickedUp(Pawn* pawn); //!< Called when the item is picked up.
+ virtual bool dropped(Pawn* pawn); //!< Called when the item is dropped.
+
+ /**
+ @brief Get the amount of jumps available.
+ @return Returns how many times the item can be used.
+ */
+ inline float getRecoveredHealth() const
+ { return this->recoveredHealth_; }
+ /**
+ @brief Set the amount of jumps available.
+ @param num New number of available jumps.
+ */
+ inline void setRecoveredHealth(float recovery)
+ { this->recoveredHealth_ = recovery; }
+ private:
+ float recoveredHealth_; //!< Amount of jumps still available.
+ };
+}
+
+#endif /* _HealthUsable_H__ */
Property changes on: trunk/src/orxonox/objects/pickup/items/HealthUsable.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/src/orxonox/objects/pickup/items/Jump.cc
===================================================================
--- trunk/src/orxonox/objects/pickup/items/Jump.cc 2009-05-25 21:16:27 UTC (rev 3077)
+++ trunk/src/orxonox/objects/pickup/items/Jump.cc 2009-05-25 21:49:42 UTC (rev 3078)
@@ -1,108 +1,108 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Daniel 'Huty' Haggenmueller
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file
- @brief Implementation of Jump.
-*/
-
-#include "Jump.h"
-#include "objects/pickup/DroppedItem.h"
-
-#include "objects/worldentities/pawns/Pawn.h"
-
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-#include "core/Core.h"
-
-namespace orxonox
-{
- CreateFactory(Jump);
-
- /**
- @brief Constructor
- @param creator Object that created this item.
- */
- Jump::Jump(BaseObject* creator) : UsableItem(creator)
- {
- RegisterObject(Jump);
-
- this->velocity_ = Vector3(0.0f, 0.0f, 0.0f);
- this->jumpsAvailable_ = 1;
- }
- //! Deconstructor
- Jump::~Jump()
- {
- }
- /**
- @brief XMLPort for Jump.
- @param xmlelement Element of the XML-file.
- @param mode XMLPort mode to use.
- */
- void Jump::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(Jump, XMLPort, xmlelement, mode);
-
- XMLPortParam(Jump, "velocity", setVelocity, getVelocity, xmlelement, mode);
- XMLPortParam(Jump, "jumpsAvailable", setJumpsAvailable, getJumpsAvailable, xmlelement, mode);
- }
- /**
- @brief Called when the item is used, makes the user "jump".
- @param pawn Pawn which used te item.
- */
- void Jump::used(Pawn* pawn)
- {
- if (this->jumpsAvailable_ > 0){
- pawn->setVelocity(pawn->getVelocity() + pawn->getOrientation() * this->velocity_);
- }
-
- this->jumpsAvailable_--;
- if (this->jumpsAvailable_ <= 0)
- {
- this->removeFrom(pawn);
- delete this;
- }
- }
- /**
- @brief Called when the item is picked up.
- @param pawn Pawn which picked up the item.
- */
- bool Jump::pickedUp(Pawn* pawn)
- {
- return this->addTo(pawn);
- }
- /**
- @brief Called when the item is dropped, creates a DroppedItem behind the pawn.
- @param pawn Pawn which dropped the item.
- */
- bool Jump::dropped(Pawn* pawn)
- {
- DroppedItem::createDefaultDrop(this, pawn, ColourValue(1.0f, 0.0f, 0.0f), 30.0f);
- return this->removeFrom(pawn);
- }
-}
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Implementation of Jump.
+*/
+
+#include "Jump.h"
+#include "objects/pickup/DroppedItem.h"
+
+#include "objects/worldentities/pawns/Pawn.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "core/Core.h"
+
+namespace orxonox
+{
+ CreateFactory(Jump);
+
+ /**
+ @brief Constructor
+ @param creator Object that created this item.
+ */
+ Jump::Jump(BaseObject* creator) : UsableItem(creator)
+ {
+ RegisterObject(Jump);
+
+ this->velocity_ = Vector3(0.0f, 0.0f, 0.0f);
+ this->jumpsAvailable_ = 1;
+ }
+ //! Deconstructor
+ Jump::~Jump()
+ {
+ }
+ /**
+ @brief XMLPort for Jump.
+ @param xmlelement Element of the XML-file.
+ @param mode XMLPort mode to use.
+ */
+ void Jump::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(Jump, XMLPort, xmlelement, mode);
+
+ XMLPortParam(Jump, "velocity", setVelocity, getVelocity, xmlelement, mode);
+ XMLPortParam(Jump, "jumpsAvailable", setJumpsAvailable, getJumpsAvailable, xmlelement, mode);
+ }
+ /**
+ @brief Called when the item is used, makes the user "jump".
+ @param pawn Pawn which used te item.
+ */
+ void Jump::used(Pawn* pawn)
+ {
+ if (this->jumpsAvailable_ > 0){
+ pawn->setVelocity(pawn->getVelocity() + pawn->getOrientation() * this->velocity_);
+ }
+
+ this->jumpsAvailable_--;
+ if (this->jumpsAvailable_ <= 0)
+ {
+ this->removeFrom(pawn);
+ delete this;
+ }
+ }
+ /**
+ @brief Called when the item is picked up.
+ @param pawn Pawn which picked up the item.
+ */
+ bool Jump::pickedUp(Pawn* pawn)
+ {
+ return this->addTo(pawn);
+ }
+ /**
+ @brief Called when the item is dropped, creates a DroppedItem behind the pawn.
+ @param pawn Pawn which dropped the item.
+ */
+ bool Jump::dropped(Pawn* pawn)
+ {
+ DroppedItem::createDefaultDrop(this, pawn, ColourValue(1.0f, 0.0f, 0.0f), 30.0f);
+ return this->removeFrom(pawn);
+ }
+}
Property changes on: trunk/src/orxonox/objects/pickup/items/Jump.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/src/orxonox/objects/pickup/items/Jump.h
===================================================================
--- trunk/src/orxonox/objects/pickup/items/Jump.h 2009-05-25 21:16:27 UTC (rev 3077)
+++ trunk/src/orxonox/objects/pickup/items/Jump.h 2009-05-25 21:49:42 UTC (rev 3078)
@@ -1,97 +1,97 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Daniel 'Huty' Haggenmueller
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file
- @brief Definition of Jump.
-*/
-
-#ifndef _Jump_H__
-#define _Jump_H__
-
-#include <climits>
-
-#include "OrxonoxPrereqs.h"
-
-#include "objects/pickup/UsableItem.h"
-#include "util/Math.h"
-
-namespace orxonox
-{
- class Pawn;
-
- /**
- @brief Jump-item, enables player to "jump" into a direction.
- */
- class _OrxonoxExport Jump : public UsableItem
- {
- public:
- Jump(BaseObject* creator); //!< Constructor
- virtual ~Jump(); //!< Deconstructor
-
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< XMLPort
-
- virtual int getMaxCarryAmount() const
- { return INT_MAX; }
-
- virtual void used(Pawn* pawn); //!< Called when the item is used.
-
- virtual bool pickedUp(Pawn* pawn); //!< Called when the item is picked up.
- virtual bool dropped(Pawn* pawn); //!< Called when the item is dropped.
-
- /**
- @brief Get the velocity added when the item is used.
- @return Returns the added velocity (relative to the Pawn).
- */
- inline const Vector3& getVelocity() const
- { return this->velocity_; }
- /**
- @brief Set the velocity added when the item is used.
- @param velocity New added velocity (relative to Pawn).
- */
- inline void setVelocity(const Vector3& velocity)
- { this->velocity_ = velocity; }
- /**
- @brief Get the amount of jumps available.
- @return Returns how many times the item can be used.
- */
- inline int getJumpsAvailable() const
- { return this->jumpsAvailable_; }
- /**
- @brief Set the amount of jumps available.
- @param num New number of available jumps.
- */
- inline void setJumpsAvailable(int num)
- { this->jumpsAvailable_ = num; }
- private:
- Vector3 velocity_; //!< The velocity added when the item is used.
- int jumpsAvailable_; //!< Amount of jumps still available.
- };
-}
-
-#endif /* _Jump_H__ */
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Definition of Jump.
+*/
+
+#ifndef _Jump_H__
+#define _Jump_H__
+
+#include <climits>
+
+#include "OrxonoxPrereqs.h"
+
+#include "objects/pickup/UsableItem.h"
+#include "util/Math.h"
+
+namespace orxonox
+{
+ class Pawn;
+
+ /**
+ @brief Jump-item, enables player to "jump" into a direction.
+ */
+ class _OrxonoxExport Jump : public UsableItem
+ {
+ public:
+ Jump(BaseObject* creator); //!< Constructor
+ virtual ~Jump(); //!< Deconstructor
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< XMLPort
+
+ virtual int getMaxCarryAmount() const
+ { return INT_MAX; }
+
+ virtual void used(Pawn* pawn); //!< Called when the item is used.
+
+ virtual bool pickedUp(Pawn* pawn); //!< Called when the item is picked up.
+ virtual bool dropped(Pawn* pawn); //!< Called when the item is dropped.
+
+ /**
+ @brief Get the velocity added when the item is used.
+ @return Returns the added velocity (relative to the Pawn).
+ */
+ inline const Vector3& getVelocity() const
+ { return this->velocity_; }
+ /**
+ @brief Set the velocity added when the item is used.
+ @param velocity New added velocity (relative to Pawn).
+ */
+ inline void setVelocity(const Vector3& velocity)
+ { this->velocity_ = velocity; }
+ /**
+ @brief Get the amount of jumps available.
+ @return Returns how many times the item can be used.
+ */
+ inline int getJumpsAvailable() const
+ { return this->jumpsAvailable_; }
+ /**
+ @brief Set the amount of jumps available.
+ @param num New number of available jumps.
+ */
+ inline void setJumpsAvailable(int num)
+ { this->jumpsAvailable_ = num; }
+ private:
+ Vector3 velocity_; //!< The velocity added when the item is used.
+ int jumpsAvailable_; //!< Amount of jumps still available.
+ };
+}
+
+#endif /* _Jump_H__ */
Property changes on: trunk/src/orxonox/objects/pickup/items/Jump.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/objects/quest/QuestNotification.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/objects/quest/QuestNotification.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/objects/worldentities/Attacher.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/objects/worldentities/Attacher.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/overlays/GUIOverlay.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/overlays/GUIOverlay.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/src/orxonox/overlays/hud/PongScore.cc
===================================================================
--- trunk/src/orxonox/overlays/hud/PongScore.cc 2009-05-25 21:16:27 UTC (rev 3077)
+++ trunk/src/orxonox/overlays/hud/PongScore.cc 2009-05-25 21:49:42 UTC (rev 3078)
@@ -1,142 +1,142 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Fabian 'x3n' Landau
- * Co-authors:
- * ...
- *
- */
-
-#include "OrxonoxStableHeaders.h"
-#include "PongScore.h"
-
-#include <OgreTextAreaOverlayElement.h>
-
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-#include "util/Convert.h"
-#include "objects/gametypes/Pong.h"
-#include "objects/infos/PlayerInfo.h"
-
-namespace orxonox
-{
- CreateFactory(PongScore);
-
- PongScore::PongScore(BaseObject* creator) : OverlayText(creator)
- {
- RegisterObject(PongScore);
-
- this->owner_ = 0;
-
- this->bShowName_ = false;
- this->bShowScore_ = false;
- this->bShowLeftPlayer_ = false;
- this->bShowRightPlayer_ = false;
- }
-
- PongScore::~PongScore()
- {
- }
-
- void PongScore::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(PongScore, XMLPort, xmlelement, mode);
-
- XMLPortParam(PongScore, "showname", setShowName, getShowName, xmlelement, mode).defaultValues(false);
- XMLPortParam(PongScore, "showscore", setShowScore, getShowScore, xmlelement, mode).defaultValues(false);
- XMLPortParam(PongScore, "showleftplayer", setShowLeftPlayer, getShowLeftPlayer, xmlelement, mode).defaultValues(false);
- XMLPortParam(PongScore, "showrightplayer", setShowRightPlayer, getShowRightPlayer, xmlelement, mode).defaultValues(false);
- }
-
- void PongScore::tick(float dt)
- {
- SUPER(PongScore, tick, dt);
-
- if (this->owner_)
- {
- PlayerInfo* player1 = this->owner_->getLeftPlayer();
- PlayerInfo* player2 = this->owner_->getRightPlayer();
-
- std::string name1;
- std::string name2;
-
- std::string score1 = "0";
- std::string score2 = "0";
-
- if (player1)
- {
- name1 = player1->getName();
- score1 = convertToString(this->owner_->getScore(player1));
- }
-
- if (player2)
- {
- name2 = player2->getName();
- score2 = convertToString(this->owner_->getScore(player2));
- }
-
- std::string output1;
- if (this->bShowLeftPlayer_)
- {
- if (this->bShowName_ && this->bShowScore_ && player1)
- output1 = name1 + " - " + score1;
- else if (this->bShowScore_)
- output1 = score1;
- else if (this->bShowName_)
- output1 = name1;
- }
-
- std::string output2;
- if (this->bShowRightPlayer_)
- {
- if (this->bShowName_ && this->bShowScore_ && player2)
- output2 = score2 + " - " + name2;
- else if (this->bShowScore_)
- output2 = score2;
- else if (this->bShowName_)
- output2 = name2;
- }
-
- std::string output = "PONG";
- if (this->bShowName_ || this->bShowScore_)
- {
- if (this->bShowLeftPlayer_ && this->bShowRightPlayer_)
- output = output1 + ":" + output2;
- else if (this->bShowLeftPlayer_ || this->bShowRightPlayer_)
- output = output1 + output2;
- }
-
- this->setCaption(output);
- }
- }
-
-
- void PongScore::changedOwner()
- {
- SUPER(PongScore, changedOwner);
-
- if (this->getOwner() && this->getOwner()->getGametype())
- this->owner_ = dynamic_cast<Pong*>(this->getOwner()->getGametype());
- else
- this->owner_ = 0;
- }
-}
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+#include "PongScore.h"
+
+#include <OgreTextAreaOverlayElement.h>
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "util/Convert.h"
+#include "objects/gametypes/Pong.h"
+#include "objects/infos/PlayerInfo.h"
+
+namespace orxonox
+{
+ CreateFactory(PongScore);
+
+ PongScore::PongScore(BaseObject* creator) : OverlayText(creator)
+ {
+ RegisterObject(PongScore);
+
+ this->owner_ = 0;
+
+ this->bShowName_ = false;
+ this->bShowScore_ = false;
+ this->bShowLeftPlayer_ = false;
+ this->bShowRightPlayer_ = false;
+ }
+
+ PongScore::~PongScore()
+ {
+ }
+
+ void PongScore::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(PongScore, XMLPort, xmlelement, mode);
+
+ XMLPortParam(PongScore, "showname", setShowName, getShowName, xmlelement, mode).defaultValues(false);
+ XMLPortParam(PongScore, "showscore", setShowScore, getShowScore, xmlelement, mode).defaultValues(false);
+ XMLPortParam(PongScore, "showleftplayer", setShowLeftPlayer, getShowLeftPlayer, xmlelement, mode).defaultValues(false);
+ XMLPortParam(PongScore, "showrightplayer", setShowRightPlayer, getShowRightPlayer, xmlelement, mode).defaultValues(false);
+ }
+
+ void PongScore::tick(float dt)
+ {
+ SUPER(PongScore, tick, dt);
+
+ if (this->owner_)
+ {
+ PlayerInfo* player1 = this->owner_->getLeftPlayer();
+ PlayerInfo* player2 = this->owner_->getRightPlayer();
+
+ std::string name1;
+ std::string name2;
+
+ std::string score1 = "0";
+ std::string score2 = "0";
+
+ if (player1)
+ {
+ name1 = player1->getName();
+ score1 = convertToString(this->owner_->getScore(player1));
+ }
+
+ if (player2)
+ {
+ name2 = player2->getName();
+ score2 = convertToString(this->owner_->getScore(player2));
+ }
+
+ std::string output1;
+ if (this->bShowLeftPlayer_)
+ {
+ if (this->bShowName_ && this->bShowScore_ && player1)
+ output1 = name1 + " - " + score1;
+ else if (this->bShowScore_)
+ output1 = score1;
+ else if (this->bShowName_)
+ output1 = name1;
+ }
+
+ std::string output2;
+ if (this->bShowRightPlayer_)
+ {
+ if (this->bShowName_ && this->bShowScore_ && player2)
+ output2 = score2 + " - " + name2;
+ else if (this->bShowScore_)
+ output2 = score2;
+ else if (this->bShowName_)
+ output2 = name2;
+ }
+
+ std::string output = "PONG";
+ if (this->bShowName_ || this->bShowScore_)
+ {
+ if (this->bShowLeftPlayer_ && this->bShowRightPlayer_)
+ output = output1 + ":" + output2;
+ else if (this->bShowLeftPlayer_ || this->bShowRightPlayer_)
+ output = output1 + output2;
+ }
+
+ this->setCaption(output);
+ }
+ }
+
+
+ void PongScore::changedOwner()
+ {
+ SUPER(PongScore, changedOwner);
+
+ if (this->getOwner() && this->getOwner()->getGametype())
+ this->owner_ = dynamic_cast<Pong*>(this->getOwner()->getGametype());
+ else
+ this->owner_ = 0;
+ }
+}
Property changes on: trunk/src/orxonox/overlays/hud/PongScore.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/src/orxonox/overlays/hud/PongScore.h
===================================================================
--- trunk/src/orxonox/overlays/hud/PongScore.h 2009-05-25 21:16:27 UTC (rev 3077)
+++ trunk/src/orxonox/overlays/hud/PongScore.h 2009-05-25 21:49:42 UTC (rev 3078)
@@ -1,77 +1,77 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Fabian 'x3n' Landau
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _PongScore_H__
-#define _PongScore_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include "overlays/OverlayText.h"
-#include "objects/Tickable.h"
-
-namespace orxonox
-{
- class _OrxonoxExport PongScore : public OverlayText, public Tickable
- {
- public:
- PongScore(BaseObject* creator);
- ~PongScore();
-
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedOwner();
-
- inline void setShowName(bool value)
- { this->bShowName_ = value; }
- inline bool getShowName() const
- { return this->bShowName_; }
-
- inline void setShowScore(bool value)
- { this->bShowScore_ = value; }
- inline bool getShowScore() const
- { return this->bShowScore_; }
-
- inline void setShowLeftPlayer(bool value)
- { this->bShowLeftPlayer_ = value; }
- inline bool getShowLeftPlayer() const
- { return this->bShowLeftPlayer_; }
-
- inline void setShowRightPlayer(bool value)
- { this->bShowRightPlayer_ = value; }
- inline bool getShowRightPlayer() const
- { return this->bShowRightPlayer_; }
-
- private:
- Pong* owner_;
- bool bShowName_;
- bool bShowScore_;
- bool bShowLeftPlayer_;
- bool bShowRightPlayer_;
- };
-}
-#endif /* _PongScore_H__ */
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _PongScore_H__
+#define _PongScore_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "overlays/OverlayText.h"
+#include "objects/Tickable.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport PongScore : public OverlayText, public Tickable
+ {
+ public:
+ PongScore(BaseObject* creator);
+ ~PongScore();
+
+ virtual void tick(float dt);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void changedOwner();
+
+ inline void setShowName(bool value)
+ { this->bShowName_ = value; }
+ inline bool getShowName() const
+ { return this->bShowName_; }
+
+ inline void setShowScore(bool value)
+ { this->bShowScore_ = value; }
+ inline bool getShowScore() const
+ { return this->bShowScore_; }
+
+ inline void setShowLeftPlayer(bool value)
+ { this->bShowLeftPlayer_ = value; }
+ inline bool getShowLeftPlayer() const
+ { return this->bShowLeftPlayer_; }
+
+ inline void setShowRightPlayer(bool value)
+ { this->bShowRightPlayer_ = value; }
+ inline bool getShowRightPlayer() const
+ { return this->bShowRightPlayer_; }
+
+ private:
+ Pong* owner_;
+ bool bShowName_;
+ bool bShowScore_;
+ bool bShowLeftPlayer_;
+ bool bShowRightPlayer_;
+ };
+}
+#endif /* _PongScore_H__ */
Property changes on: trunk/src/orxonox/overlays/hud/PongScore.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/overlays/notifications/NotificationOverlay.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/overlays/notifications/NotificationOverlay.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/sound/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/sound/SoundBase.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/sound/SoundBase.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/sound/SoundMainMenu.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/sound/SoundMainMenu.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/sound/SoundManager.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/orxonox/sound/SoundManager.h
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list