Changeset 6996 for code/branches/presentation3/src/orxonox/interfaces/Pickupable.h

Timestamp:

May 27, 2010, 10:44:10 PM (14 years ago)

Author:

dafrick

Message:

Loads of changes.
1) PickupInventory should now be working even for extreme cases.
2) Added support for inactive Spawnpoints in Gametype.
3) Made Pickupable rewardble. meaning from now on any Pickupable can be given as a reward for completing Quests.
4) Added some keybinds to KeybindMenu, such as PickupInventory, QuestGUI and Chat.

File:

• code/branches/presentation3/src/orxonox/interfaces/Pickupable.h (modified) (3 diffs)

code/branches/presentation3/src/orxonox/interfaces/Pickupable.h

@@ -41 +41 @@
 
 #include "core/OrxonoxClass.h"
+#include "Rewardable.h"
 
 namespace orxonox // tolua_export
@@ -52 +53 @@
     */
     class _OrxonoxExport Pickupable  // tolua_export
-        : virtual public OrxonoxClass
+        : virtual public OrxonoxClass, public Rewardable
     {  // tolua_export
         protected:
@@ -141 +142 @@
             std::list<Identifier*> targets_; //!< The possible targets of this pickup.
 
+        // For implementing the Rewardable interface:
+        public:
+            virtual bool reward(PlayerInfo* player); //!< Method to transcribe a Pickupable as a Rewardable to the player.
+
     };  // tolua_export