[Orxonox-commit 649] r3181 - in branches/pch/src/orxonox: interfaces objects/quest
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Jun 15 21:40:19 CEST 2009
Author: rgrieder
Date: 2009-06-15 21:40:19 +0200 (Mon, 15 Jun 2009)
New Revision: 3181
Added:
branches/pch/src/orxonox/interfaces/Rewardable.h
Removed:
branches/pch/src/orxonox/objects/quest/Rewardable.cc
branches/pch/src/orxonox/objects/quest/Rewardable.h
Modified:
branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc
branches/pch/src/orxonox/objects/quest/CMakeLists.txt
Log:
Moved Rewardable (quest system) to the interface section.
Modified: branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc
===================================================================
--- branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc 2009-06-15 19:34:07 UTC (rev 3180)
+++ branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc 2009-06-15 19:40:19 UTC (rev 3181)
@@ -35,6 +35,7 @@
#include "GametypeMessageListener.h"
#include "PawnListener.h"
#include "RadarListener.h"
+#include "Rewardable.h"
#include "Teamcolourable.h"
#include "Tickable.h"
#include "TimeFactorListener.h"
@@ -110,4 +111,12 @@
{
RegisterRootObject(WindowEventListener);
}
+
+ //----------------------------
+ // Rewardable
+ //----------------------------
+ Rewardable::Rewardable()
+ {
+ RegisterObject(Rewardable);
+ }
}
Copied: branches/pch/src/orxonox/interfaces/Rewardable.h (from rev 3180, branches/pch/src/orxonox/objects/quest/Rewardable.h)
===================================================================
--- branches/pch/src/orxonox/interfaces/Rewardable.h (rev 0)
+++ branches/pch/src/orxonox/interfaces/Rewardable.h 2009-06-15 19:40:19 UTC (rev 3181)
@@ -0,0 +1,70 @@
+/*
+ * 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:
+ * Damian 'Mozork' Frick
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Definition of the Rewardable class.
+*/
+
+#ifndef _Rewardable_H__
+#define _Rewardable_H__
+
+#include "OrxonoxPrereqs.h"
+#include "core/OrxonoxClass.h"
+
+namespace orxonox
+{
+ /**
+ @brief
+ Rewardable is an Interface, that can be implemented by any object to enable it to be given as reward to a player through QuestEffects. (With the AddReward effect.)
+
+ It just needs to inherit form Rewardable, and implement the reward() method.
+ @author
+ Damian 'Mozork' Frick
+ */
+ class _OrxonoxExport Rewardable : public OrxonoxClass
+ {
+ public:
+ Rewardable();
+ virtual ~Rewardable() {}
+
+ /**
+ @brief
+ Method to transcribe a rewardable object to the player.
+ Must be implemented by every class inheriting from Rewardable.
+ @param player
+ A pointer to the ControllableEntity, do whatever you want with it.
+ @return
+ Return true if successful.
+ */
+ virtual bool reward(PlayerInfo* player) = 0;
+
+ };
+}
+
+#endif /* _Rewardable_H__ */
Modified: branches/pch/src/orxonox/objects/quest/CMakeLists.txt
===================================================================
--- branches/pch/src/orxonox/objects/quest/CMakeLists.txt 2009-06-15 19:34:07 UTC (rev 3180)
+++ branches/pch/src/orxonox/objects/quest/CMakeLists.txt 2009-06-15 19:40:19 UTC (rev 3181)
@@ -16,5 +16,4 @@
QuestListener.cc
QuestManager.cc
QuestNotification.cc
- Rewardable.cc
)
Deleted: branches/pch/src/orxonox/objects/quest/Rewardable.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/Rewardable.cc 2009-06-15 19:34:07 UTC (rev 3180)
+++ branches/pch/src/orxonox/objects/quest/Rewardable.cc 2009-06-15 19:40:19 UTC (rev 3181)
@@ -1,47 +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:
- * Damian 'Mozork' Frick
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file
- @brief Implementation of the Rewardable class.
-*/
-
-#include "Rewardable.h"
-#include "core/CoreIncludes.h"
-
-namespace orxonox
-{
- /**
- @brief
- Constructor. Registers the object.
- */
- Rewardable::Rewardable()
- {
- RegisterObject(Rewardable);
- }
-}
Deleted: branches/pch/src/orxonox/objects/quest/Rewardable.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/Rewardable.h 2009-06-15 19:34:07 UTC (rev 3180)
+++ branches/pch/src/orxonox/objects/quest/Rewardable.h 2009-06-15 19:40:19 UTC (rev 3181)
@@ -1,70 +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:
- * Damian 'Mozork' Frick
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file
- @brief Definition of the Rewardable class.
-*/
-
-#ifndef _Rewardable_H__
-#define _Rewardable_H__
-
-#include "OrxonoxPrereqs.h"
-#include "core/OrxonoxClass.h"
-
-namespace orxonox
-{
- /**
- @brief
- Rewardable is an Interface, that can be implemented by any object to enable it to be given as reward to a player through QuestEffects. (With the AddReward effect.)
-
- It just needs to inherit form Rewardable, and implement the reward() method.
- @author
- Damian 'Mozork' Frick
- */
- class _OrxonoxExport Rewardable : public OrxonoxClass
- {
- public:
- Rewardable();
- virtual ~Rewardable() {}
-
- /**
- @brief
- Method to transcribe a rewardable object to the player.
- Must be implemented by every class inheriting from Rewardable.
- @param player
- A pointer to the ControllableEntity, do whatever you want with it.
- @return
- Return true if successful.
- */
- virtual bool reward(PlayerInfo* player) = 0;
-
- };
-}
-
-#endif /* _Rewardable_H__ */
More information about the Orxonox-commit
mailing list