Changeset 708 for code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.h

Timestamp:

Dec 28, 2007, 10:30:29 PM (18 years ago)

Author:

rgrieder

Message:

• added Vector2, Vector3, Matrix3, ColourValue, Quaternion and String to the misc folder as header files (each of them contains #include <string> … typedef std::string String , etc.)
• please use String from now on by including <misc/String.h"
• removed #include <OgreVector3.h", etc. from "CoreIncludes.h" (adjusted all source files)
• adjusted all the source files (except network, that keeps <string> for the moment) (what a mess..)
• moved usleep hack to misc/Sleep.h
• relative include paths for files from other root directories (like misc, network, etc.) (but it stills writes "../Orxonox.h" when in folder orxonox/objects)
• "OgreSceneManager.h" —> <OgreSceneManager.h>
• included OrxonoxPrereqs in every file in folder orxonox
• moved HUD and ParticleInterface to namespace orxonox
• removed some using namespace Ogre/std when appropriate
• I hope I haven't forgotten important points..

File:

• code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.h (modified) (2 diffs)

code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.h

@@ -32 +32 @@
 #include <OgrePrerequisites.h>
 
-#include "orxonox/OrxonoxPrereqs.h"
+#include "../../OrxonoxPrereqs.h"
 
 #include "network/Synchronisable.h"
 //#include "../core/CoreIncludes.h"
+#include "misc/String.h"
 #include "../BaseObject.h"
 
@@ -46 +47 @@
           ~AmmunitionDump();
 
-    void setDumpSize(const Ogre::String &name, int size);
+    void setDumpSize(const String &name, int size);
 
-    int store(const Ogre::String &name, int quantiy);
+    int store(const String &name, int quantiy);
 
-    int getAmmunition(const Ogre::String &name, int quantity);
+    int getAmmunition(const String &name, int quantity);
 
-    int getStockSize(const Ogre::String &name);
+    int getStockSize(const String &name);
 
     virtual void loadParams(TiXmlElement* xmlElem) { BaseObject::loadParams(xmlElem); };