[Orxonox-commit 1778] r6496 - in code/branches/pickup3/src/modules/pickup: . items

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-03-08 20:07:48 +0100 (Mon, 08 Mar 2010)
New Revision: 6496

Modified:
   code/branches/pickup3/src/modules/pickup/DroppedPickup.h
   code/branches/pickup3/src/modules/pickup/PickupPrereqs.h
   code/branches/pickup3/src/modules/pickup/PickupSpawner.h
   code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc
   code/branches/pickup3/src/modules/pickup/items/HealthPickup.h
Log:
Fixed DLL interface on Windows.

Modified: code/branches/pickup3/src/modules/pickup/DroppedPickup.h
===================================================================
--- code/branches/pickup3/src/modules/pickup/DroppedPickup.h	2010-03-08 14:36:02 UTC (rev 6495)
+++ code/branches/pickup3/src/modules/pickup/DroppedPickup.h	2010-03-08 19:07:48 UTC (rev 6496)
@@ -48,7 +48,7 @@
         Daniel 'Huty' Haggenmueller
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport DroppedPickup : public PickupSpawner
+    class _PickupExport DroppedPickup : public PickupSpawner
     {
         public:
             DroppedPickup(BaseObject* creator); //!< Default constructor.

Modified: code/branches/pickup3/src/modules/pickup/PickupPrereqs.h
===================================================================
--- code/branches/pickup3/src/modules/pickup/PickupPrereqs.h	2010-03-08 14:36:02 UTC (rev 6495)
+++ code/branches/pickup3/src/modules/pickup/PickupPrereqs.h	2010-03-08 19:07:48 UTC (rev 6496)
@@ -43,7 +43,7 @@
 //-----------------------------------------------------------------------
 
 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
-#  ifdef QUESTSYSTEM_SHARED_BUILD
+#  ifdef PICKUP_SHARED_BUILD
 #    define _PickupExport __declspec(dllexport)
 #  else
 #    if defined( __MINGW32__ )

Modified: code/branches/pickup3/src/modules/pickup/PickupSpawner.h
===================================================================
--- code/branches/pickup3/src/modules/pickup/PickupSpawner.h	2010-03-08 14:36:02 UTC (rev 6495)
+++ code/branches/pickup3/src/modules/pickup/PickupSpawner.h	2010-03-08 19:07:48 UTC (rev 6496)
@@ -53,7 +53,7 @@
             Daniel 'Huty' Haggenmueller
             Damian 'Mozork' Frick
     */
-    class _OrxonoxExport PickupSpawner : public StaticEntity, public Tickable
+    class _PickupExport PickupSpawner : public StaticEntity, public Tickable
     {
         public:
             PickupSpawner(BaseObject* creator); //!< Default Constructor.

Modified: code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc
===================================================================
--- code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc	2010-03-08 14:36:02 UTC (rev 6495)
+++ code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc	2010-03-08 19:07:48 UTC (rev 6496)
@@ -109,7 +109,7 @@
     @brief
         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);
         

Modified: code/branches/pickup3/src/modules/pickup/items/HealthPickup.h
===================================================================
--- code/branches/pickup3/src/modules/pickup/items/HealthPickup.h	2010-03-08 14:36:02 UTC (rev 6495)
+++ code/branches/pickup3/src/modules/pickup/items/HealthPickup.h	2010-03-08 19:07:48 UTC (rev 6496)
@@ -54,11 +54,11 @@
     /**
     @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
     */