Changeset 11353 for code/trunk/src/modules/pickup/PickupManager.h
- Timestamp:
- Mar 9, 2017, 2:46:20 PM (7 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/HUD_HS16 (added) merged: 11212,11222-11223,11240-11241,11252-11253,11262-11264,11277,11293,11295,11305,11314,11323,11325,11336
- Property svn:mergeinfo changed
-
code/trunk/src/modules/pickup/PickupManager.h
r11071 r11353 42 42 43 43 #include "PickupRepresentation.h" 44 44 #include "interfaces/Pickupable.h" 45 45 #include "util/Singleton.h" 46 46 #include "interfaces/PickupListener.h" 47 #include "overlays/hud/HUDPickupSystem.h" 47 48 48 49 namespace orxonox // tolua_export … … 135 136 136 137 void dropPickup(uint32_t pickup); //!< Drop the input Pickupable. 138 static void useUnusePickup(uint32_t index); //tolua_export 137 139 void usePickup(uint32_t pickup, bool use); //!< Use (or unuse) the input Pickupable. 138 140 /** … … 147 149 static void dropPickupNetworked(uint32_t pickup); //!< Helper method to drop the input pickup on the server. 148 150 static void usePickupNetworked(uint32_t pickup, bool use); //!< Helper method to use (or unuse) the input Pickupable on the server. 151 void setPickupSystem(HUDPickupSystem* system); 149 152 150 153 private: 154 HUDPickupSystem* pickupSystem; 155 std::vector<Pickupable*> picks; 156 151 157 static PickupManager* singletonPtr_s; 152 158 static const std::string guiName_s; //!< The name of the PickupInventory … … 166 172 void updateGUI(void); //!< Updates the PickupInventory GUI. 167 173 uint32_t getPickupIndex(void); //!< Get a new index for a Pickupable. 168 174 169 175 }; // tolua_export 170 176
Note: See TracChangeset
for help on using the changeset viewer.