Changeset 6675 for code/branches/pickup4/src/modules/pickup/PickupRepresentation.h

Timestamp:

Apr 2, 2010, 5:35:14 PM (15 years ago)

Author:

dafrick

Message:

Lua bugs fixed.
Renamed name and description in PickupRepresentation to pickupName and pickupDescription to avoid problems.
More work on PickupInventory.

File:

• code/branches/pickup4/src/modules/pickup/PickupRepresentation.h (modified) (3 diffs)

code/branches/pickup4/src/modules/pickup/PickupRepresentation.h

@@ -68 +68 @@
             @param name The name.
             */
-            inline void setName(const std::string& name)
+            inline void setPickupName(const std::string& name)
                 { this->name_ = name; }
             /**
@@ -74 +74 @@
             @param description The Description.
             */
-            inline void setDescription(const std::string& description)
+            inline void setPickupDescription(const std::string& description)
                 { this->description_ = description; }
             /**
@@ -107 +107 @@
             @return Returns the name.
             */
-            inline const std::string& getName(void) { return this->name_; } // tolua_export
+            inline const std::string& getPickupName(void) { return this->name_; } // tolua_export
             /**
             @brief Get the description of the Pickupable represented by this PickupRepresentation.
             @return Returns the description.
             */
-            inline const std::string& getDescription(void) { return this->description_; } // tolua_export
+            inline const std::string& getPickupDescription(void) { return this->description_; } // tolua_export
             /**
             @brief Get the name of spawnerTemplate the Pickupable represented by this PickupRepresentation.