Changeset 10576 for code/branches/core7/src/orxonox/interfaces/Pickupable.h

Timestamp:

Sep 9, 2015, 2:15:46 PM (9 years ago)

Author:

landauf

Message:

removed changedGametype and getOldGametype from BaseObject. the gametype is never supposed to change anyway. the only exception is PlayerInfo which may change a gametype. but this happens in a completely controlled manner and can be done with a separate new function (switchGametype).

File:

• code/branches/core7/src/orxonox/interfaces/Pickupable.h (modified) (1 diff)

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

@@ -187 +187 @@
 
     //! SUPER functions.
-    SUPER_FUNCTION(10, Pickupable, changedUsed, false);
-    SUPER_FUNCTION(11, Pickupable, changedCarrier, false);
-    SUPER_FUNCTION(12, Pickupable, changedPickedUp, false);
+    SUPER_FUNCTION(9, Pickupable, changedUsed, false);
+    SUPER_FUNCTION(10, Pickupable, changedCarrier, false);
+    SUPER_FUNCTION(11, Pickupable, changedPickedUp, false);
 }