Changeset 10616 for code/branches/presentationFS15merge/src/modules/objects

Timestamp:

Oct 4, 2015, 12:20:35 PM (9 years ago)

Author:

landauf

Message:

merged branch weaponFS15 (but without changes in weaponSettingsAssff.oxi)

Location:

code/branches/presentationFS15merge

Files:

• . (modified) (1 prop)
• src/modules/objects/ForceField.h (modified) (2 diffs)

code/branches/presentationFS15merge/src/modules/objects/ForceField.h

@@ -160 +160 @@
             const std::string& getMode(void); //!< Get the mode of the ForceField.
 
-        private:
             //! Strings to represent the modes.
             static const std::string modeTube_s;
@@ -166 +165 @@
             static const std::string modeInvertedSphere_s;
             static const std::string modeNewtonianGravity_s;
-
             static const std::string modeHomogen_s;
 
+        private:
             float velocity_; //!< The velocity of the ForceField.
             float radius_; //!< The radius of the ForceField.