Changeset 10486 for code/branches/presentationFS15/src/modules/objects

Timestamp:

May 26, 2015, 12:53:08 PM (10 years ago)

Author:

maxima

Message:

weaponFS15 branch merged to presentation. spaceshipFS15 has GravityBomb on mode 2

Location:

code/branches/presentationFS15

Files:

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

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

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