[Orxonox-commit 651] r3183 - in branches/pch/src/orxonox: interfaces objects/gametypes objects/quest objects/worldentities objects/worldentities/pawns
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Jun 15 22:48:12 CEST 2009
Author: rgrieder
Date: 2009-06-15 22:48:12 +0200 (Mon, 15 Jun 2009)
New Revision: 3183
Added:
branches/pch/src/orxonox/interfaces/TeamColourable.h
Removed:
branches/pch/src/orxonox/interfaces/Teamcolourable.h
Modified:
branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc
branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc
branches/pch/src/orxonox/objects/quest/AddReward.cc
branches/pch/src/orxonox/objects/worldentities/Billboard.h
branches/pch/src/orxonox/objects/worldentities/Light.h
branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc
Log:
Renamed Teamcolourable to TeamColourable
Modified: branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc
===================================================================
--- branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc 2009-06-15 19:50:37 UTC (rev 3182)
+++ branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc 2009-06-15 20:48:12 UTC (rev 3183)
@@ -36,7 +36,7 @@
#include "PawnListener.h"
#include "RadarListener.h"
#include "Rewardable.h"
-#include "Teamcolourable.h"
+#include "TeamColourable.h"
#include "Tickable.h"
#include "TimeFactorListener.h"
#include "WindowEventListener.h"
@@ -73,11 +73,11 @@
}
//----------------------------
- // Teamcolourable
+ // TeamColourable
//----------------------------
- Teamcolourable::Teamcolourable()
+ TeamColourable::TeamColourable()
{
- RegisterRootObject(Teamcolourable);
+ RegisterRootObject(TeamColourable);
}
//----------------------------
Copied: branches/pch/src/orxonox/interfaces/TeamColourable.h (from rev 3182, branches/pch/src/orxonox/interfaces/Teamcolourable.h)
===================================================================
--- branches/pch/src/orxonox/interfaces/TeamColourable.h (rev 0)
+++ branches/pch/src/orxonox/interfaces/TeamColourable.h 2009-06-15 20:48:12 UTC (rev 3183)
@@ -0,0 +1,49 @@
+/*
+ * 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 _TeamColourable_H__
+#define _TeamColourable_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "util/UtilPrereqs.h"
+#include "core/OrxonoxClass.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport TeamColourable : virtual public OrxonoxClass
+ {
+ public:
+ virtual void setTeamColour(const ColourValue& colour) = 0;
+
+ protected:
+ TeamColourable();
+ };
+}
+
+#endif /* _TeamColourable_H__ */
Property changes on: branches/pch/src/orxonox/interfaces/TeamColourable.h
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/buildsystem/src/orxonox/interfaces/Teamcolourable.h:1875-2277,2279-2401
/branches/buildsystem2/src/orxonox/interfaces/Teamcolourable.h:2507-2659
/branches/buildsystem3/src/orxonox/interfaces/Teamcolourable.h:2663-2709
/branches/ceguilua/src/orxonox/interfaces/Teamcolourable.h:1803-1809
/branches/core3/src/orxonox/interfaces/Teamcolourable.h:1573-1740
/branches/gametypes/src/orxonox/interfaces/Teamcolourable.h:2827-3032
/branches/gcc43/src/orxonox/interfaces/Teamcolourable.h:1581
/branches/gui/src/orxonox/interfaces/Teamcolourable.h:1636-1724,2796-2895
/branches/input/src/orxonox/interfaces/Teamcolourable.h:1630-1637
/branches/lodfinal/src/orxonox/interfaces/Teamcolourable.h:2373-2412
/branches/map/src/orxonox/interfaces/Teamcolourable.h:2802-3087,3090
/branches/miniprojects/src/orxonox/interfaces/Teamcolourable.h:2755-2825
/branches/netp2/src/orxonox/interfaces/Teamcolourable.h:2836-2989
/branches/netp3/src/orxonox/interfaces/Teamcolourable.h:2989-3083
/branches/network/src/orxonox/interfaces/Teamcolourable.h:2357
/branches/network64/src/orxonox/interfaces/Teamcolourable.h:2211-2356
/branches/objecthierarchy/src/orxonox/interfaces/Teamcolourable.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/orxonox/interfaces/Teamcolourable.h:2172-2480
/branches/overlay/src/orxonox/interfaces/Teamcolourable.h:2118-2386
/branches/particles/src/orxonox/interfaces/Teamcolourable.h:2830-3086
/branches/physics/src/orxonox/interfaces/Teamcolourable.h:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/interfaces/Teamcolourable.h:2437-2458
/branches/pickups/src/orxonox/interfaces/Teamcolourable.h:1927-2087,2128,2828-2916
/branches/pickups2/src/orxonox/interfaces/Teamcolourable.h:2108-2498,2916-3072
/branches/presentation/src/orxonox/interfaces/Teamcolourable.h:2370-2653,2655-2661
/branches/questsystem/src/orxonox/interfaces/Teamcolourable.h:1895-2089
/branches/questsystem2/src/orxonox/interfaces/Teamcolourable.h:2108-2260
/branches/questsystem5/src/orxonox/interfaces/Teamcolourable.h:2777-2906
/branches/script_trigger/src/orxonox/interfaces/Teamcolourable.h:1296-1954,1956
/branches/sound/src/orxonox/interfaces/Teamcolourable.h:2830-3011
/branches/weapon/src/orxonox/interfaces/Teamcolourable.h:1926-2095
/branches/weapon2/src/orxonox/interfaces/Teamcolourable.h:2108-2489
/branches/weapons/src/orxonox/interfaces/Teamcolourable.h:2898-3052
/branches/weaponsystem/src/orxonox/interfaces/Teamcolourable.h:2743-2891
Added: svn:eol-style
+ native
Deleted: branches/pch/src/orxonox/interfaces/Teamcolourable.h
===================================================================
--- branches/pch/src/orxonox/interfaces/Teamcolourable.h 2009-06-15 19:50:37 UTC (rev 3182)
+++ branches/pch/src/orxonox/interfaces/Teamcolourable.h 2009-06-15 20:48:12 UTC (rev 3183)
@@ -1,49 +0,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:
- * ...
- *
- */
-
-#ifndef _Teamcolourable_H__
-#define _Teamcolourable_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include "util/UtilPrereqs.h"
-#include "core/OrxonoxClass.h"
-
-namespace orxonox
-{
- class _OrxonoxExport Teamcolourable : virtual public OrxonoxClass
- {
- public:
- virtual void setTeamColour(const ColourValue& colour) = 0;
-
- protected:
- Teamcolourable();
- };
-}
-
-#endif /* _Teamcolourable_H__ */
Modified: branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc 2009-06-15 19:50:37 UTC (rev 3182)
+++ branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc 2009-06-15 20:48:12 UTC (rev 3183)
@@ -30,7 +30,7 @@
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
-#include "interfaces/Teamcolourable.h"
+#include "interfaces/TeamColourable.h"
#include "objects/worldentities/TeamSpawnPoint.h"
namespace orxonox
@@ -167,9 +167,9 @@
std::set<WorldEntity*> pawnAttachments = pawn->getAttachedObjects();
for (std::set<WorldEntity*>::iterator it = pawnAttachments.begin(); it != pawnAttachments.end(); ++it)
{
- if ((*it)->isA(Class(Teamcolourable)))
+ if ((*it)->isA(Class(TeamColourable)))
{
- Teamcolourable* tc = dynamic_cast<Teamcolourable*>(*it);
+ TeamColourable* tc = dynamic_cast<TeamColourable*>(*it);
tc->setTeamColour(this->teamcolours_[it_player->second]);
}
}
Modified: branches/pch/src/orxonox/objects/quest/AddReward.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddReward.cc 2009-06-15 19:50:37 UTC (rev 3182)
+++ branches/pch/src/orxonox/objects/quest/AddReward.cc 2009-06-15 20:48:12 UTC (rev 3183)
@@ -35,7 +35,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "Rewardable.h"
+#include "interfaces/Rewardable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/Billboard.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Billboard.h 2009-06-15 19:50:37 UTC (rev 3182)
+++ branches/pch/src/orxonox/objects/worldentities/Billboard.h 2009-06-15 20:48:12 UTC (rev 3183)
@@ -33,11 +33,11 @@
#include "StaticEntity.h"
#include "util/Math.h"
#include "tools/BillboardSet.h"
-#include "interfaces/Teamcolourable.h"
+#include "interfaces/TeamColourable.h"
namespace orxonox
{
- class _OrxonoxExport Billboard : public StaticEntity, public Teamcolourable
+ class _OrxonoxExport Billboard : public StaticEntity, public TeamColourable
{
public:
Billboard(BaseObject* creator);
Modified: branches/pch/src/orxonox/objects/worldentities/Light.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Light.h 2009-06-15 19:50:37 UTC (rev 3182)
+++ branches/pch/src/orxonox/objects/worldentities/Light.h 2009-06-15 20:48:12 UTC (rev 3183)
@@ -36,11 +36,11 @@
#include <OgreLight.h>
#include "util/Math.h"
-#include "interfaces/Teamcolourable.h"
+#include "interfaces/TeamColourable.h"
namespace orxonox
{
- class _OrxonoxExport Light : public StaticEntity, public Teamcolourable
+ class _OrxonoxExport Light : public StaticEntity, public TeamColourable
{
public:
Light(BaseObject* creator);
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc 2009-06-15 19:50:37 UTC (rev 3182)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc 2009-06-15 20:48:12 UTC (rev 3183)
@@ -30,7 +30,7 @@
#include "TeamBaseMatchBase.h"
#include "core/CoreIncludes.h"
#include "objects/gametypes/TeamBaseMatch.h"
-#include "interfaces/Teamcolourable.h"
+#include "interfaces/TeamColourable.h"
#include "interfaces/PawnListener.h"
namespace orxonox
@@ -80,9 +80,9 @@
std::set<WorldEntity*> attachments = this->getAttachedObjects();
for (std::set<WorldEntity*>::iterator it = attachments.begin(); it != attachments.end(); ++it)
{
- if ((*it)->isA(Class(Teamcolourable)))
+ if ((*it)->isA(Class(TeamColourable)))
{
- Teamcolourable* tc = dynamic_cast<Teamcolourable*>(*it);
+ TeamColourable* tc = dynamic_cast<TeamColourable*>(*it);
tc->setTeamColour(colour);
}
}
More information about the Orxonox-commit
mailing list