Changeset 6496 for code/branches/pickup3/src/modules/pickup

Timestamp:

Mar 8, 2010, 8:07:48 PM (15 years ago)

Author:

rgrieder

Message:

Fixed DLL interface on Windows.

Location:

code/branches/pickup3/src/modules/pickup

Files:

• DroppedPickup.h (modified) (1 diff)
• PickupPrereqs.h (modified) (1 diff)
• PickupSpawner.h (modified) (1 diff)
• items/HealthPickup.cc (modified) (1 diff)
• items/HealthPickup.h (modified) (1 diff)

code/branches/pickup3/src/modules/pickup/DroppedPickup.h

@@ -49 +49 @@
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport DroppedPickup : public PickupSpawner
+    class _PickupExport DroppedPickup : public PickupSpawner
     {
         public:

code/branches/pickup3/src/modules/pickup/PickupPrereqs.h

@@ -44 +44 @@
 
 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
-#  ifdef QUESTSYSTEM_SHARED_BUILD
+#  ifdef PICKUP_SHARED_BUILD
 #    define _PickupExport __declspec(dllexport)
 #  else

code/branches/pickup3/src/modules/pickup/PickupSpawner.h

@@ -54 +54 @@
             Damian 'Mozork' Frick
     */
-    class _OrxonoxExport PickupSpawner : public StaticEntity, public Tickable
+    class _PickupExport PickupSpawner : public StaticEntity, public Tickable
     {
         public:

code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc

@@ -110 +110 @@
         Method for creating a HealthPickup object through XML.
     */
-    void HealthPickup::HealthPickup::XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode)
+    void HealthPickup::XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode)
     {
         SUPER(HealthPickup, XMLPort, xmlelement, mode);

code/branches/pickup3/src/modules/pickup/items/HealthPickup.h

@@ -55 +55 @@
     @brief
         A pickup that can do (dependent upon the parameters) lots of different things to the health of a Pawn.
-        There are 4 parameters that can be choosen:
+        There are 4 parameters that can be chosen:
         1) The health. The amount of health that (in a way dependent on the other parameters) is transfered to the Pawn.
         2) The activation type: It can be chosen to be either 'immediate' or 'onUse'. The activation type essentially (as indicated by the name) defines when the health is transfered, either immediately after being picked up or only after the player uses it.
         3) The duration type: It can be chosen to be either 'once' or 'continuous'. For 'once' the specified health is transfered once to the Pawn, for 'continuous' the set health is transfered over a span of time at a rate defined by the health rate parameter.
-        4) The health type: The health type can be choosen to be 'limited', 'temporary' or 'permanent'. 'limited' means that the health is increased only to the maximum health of the Pawn. 'temporary' means that the maximum health is temporarily elevated but will be set back as soon as the pickup is no longer in use. 'permanent' means that the maximum health of the Pawn is increased such that the health provided by the pickup will fit in and the maximum health stays that way.
+        4) The health type: The health type can be chosen to be 'limited', 'temporary' or 'permanent'. 'limited' means that the health is increased only to the maximum health of the Pawn. 'temporary' means that the maximum health is temporarily elevated but will be set back as soon as the pickup is no longer in use. 'permanent' means that the maximum health of the Pawn is increased such that the health provided by the pickup will fit in and the maximum health stays that way.
     @author
         Damian 'Mozork' Frick