Index: orxonox/trunk/src/util/loading/factory.cc
===================================================================
--- orxonox/trunk/src/util/loading/factory.cc	(revision 4834)
+++ orxonox/trunk/src/util/loading/factory.cc	(revision 4836)
@@ -26,5 +26,5 @@
 
 /**
-   \brief constructor
+ *  constructor
 
    set everything to zero and define factoryName
@@ -44,5 +44,5 @@
 
 /**
-   \brief destructor
+ *  destructor
 
    clear the Q
@@ -58,6 +58,6 @@
 
 /**
-   \brief add a Factory to the Factory Queue
-   \param factory a Factory to be registered
+ *  add a Factory to the Factory Queue
+ * @param factory a Factory to be registered
 */
 void Factory::registerFactory( Factory* factory)
Index: orxonox/trunk/src/util/loading/factory.h
===================================================================
--- orxonox/trunk/src/util/loading/factory.h	(revision 4834)
+++ orxonox/trunk/src/util/loading/factory.h	(revision 4836)
@@ -33,5 +33,5 @@
     Creates a factory to a Loadable Class.
     this should be used at the beginning of all the Classes that should be loadable (in the cc-file)
-  \todo make factoryName a BaseObject-parameter. (else it would be redundant)
+  @todo make factoryName a BaseObject-parameter. (else it would be redundant)
 */
 #define CREATE_FACTORY(CLASS_NAME) tFactory<CLASS_NAME>* global_##CLASS_NAME##_Factory = new tFactory<CLASS_NAME>(#CLASS_NAME)
@@ -48,9 +48,9 @@
 
   static void registerFactory( Factory* factory);
-  /** \brief sets the Next factory in the list \param nextFactory the next factory */
+  /** \brief sets the Next factory in the list @param nextFactory the next factory */
   inline void setNext( Factory* nextFactory) { this->next = nextFactory; };
-  /** \returns the first factory */
+  /** @returns the first factory */
   static Factory* getFirst() { return Factory::first; };
-  /** \returns the next factory */
+  /** @returns the next factory */
   Factory* getNext() const { return this->next; };
 
@@ -64,5 +64,5 @@
 
 /**
-   \brief a factory that is able to load any kind of Object
+ *  a factory that is able to load any kind of Object
    (this is a Functor)
 */
@@ -78,6 +78,6 @@
 
 /**
-   \brief construnts a factory with
-   \param factoryName the name of the factory
+ *  construnts a factory with
+ * @param factoryName the name of the factory
 */
 template<class T>
Index: orxonox/trunk/src/util/loading/game_loader.cc
===================================================================
--- orxonox/trunk/src/util/loading/game_loader.cc	(revision 4834)
+++ orxonox/trunk/src/util/loading/game_loader.cc	(revision 4836)
@@ -37,5 +37,5 @@
 
 /**
-   \brief simple constructor
+ *  simple constructor
 */
 GameLoader::GameLoader ()
@@ -47,5 +47,5 @@
 
 /**
-   \brief simple deconstructor
+ *  simple deconstructor
 */
 GameLoader::~GameLoader ()
@@ -59,6 +59,6 @@
 
 /**
-   \brief this class is a singleton class
-   \returns an instance of itself
+ *  this class is a singleton class
+ * @returns an instance of itself
 
    if you are unsure about singleton classes, check the theory out on the internet :)
@@ -72,5 +72,5 @@
 
 /**
-   \brief initializes the GameLoader
+ *  initializes the GameLoader
 */
 ErrorMessage GameLoader::init()
@@ -88,7 +88,7 @@
 
 /**
-   \brief reads a campaign definition file into a campaign class
-   \param fileName to be loaded
-   \returns the loaded campaign
+ *  reads a campaign definition file into a campaign class
+ * @param fileName to be loaded
+ * @returns the loaded campaign
 
    this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
@@ -109,7 +109,7 @@
 
 /**
-   \brief loads a debug campaign for test purposes only.
-   \param campaignID the identifier of the campaign.
-   \returns error message if not able to do so.
+ *  loads a debug campaign for test purposes only.
+ * @param campaignID the identifier of the campaign.
+ * @returns error message if not able to do so.
 */
 ErrorMessage GameLoader::loadDebugCampaign(Uint32 campaignID)
@@ -147,6 +147,6 @@
 
 /**
-    \brief starts the current entity
-    \returns error code if this action has caused a error
+  *  starts the current entity
+  * @returns error code if this action has caused a error
 */
 ErrorMessage GameLoader::start()
@@ -158,6 +158,6 @@
 
 /**
-    \brief stops the current entity
-    \returns error code if this action has caused a error
+  *  stops the current entity
+  * @returns error code if this action has caused a error
 
     ATTENTION: this function shouldn't call other functions, or if so, they must return
@@ -175,6 +175,6 @@
 
 /**
-    \brief pause the current entity
-    \returns error code if this action has caused a error
+  *  pause the current entity
+  * @returns error code if this action has caused a error
 
     this pauses the current entity or passes this call forth to the running entity.
@@ -189,6 +189,6 @@
 
 /**
-    \brief resumes a pause
-    \returns error code if this action has caused a error
+  *  resumes a pause
+  * @returns error code if this action has caused a error
 
     this resumess the current entity or passes this call forth to the running entity.
@@ -203,5 +203,5 @@
 
 /**
-   \brief release the mem ATTENTION: not implemented
+ *  release the mem ATTENTION: not implemented
  */
 ErrorMessage GameLoader::destroy()
@@ -212,7 +212,7 @@
 
 /**
-   \brief reads a campaign definition file into a campaign class
-   \param fileName to be loaded
-   \returns the loaded campaign
+ *  reads a campaign definition file into a campaign class
+ * @param fileName to be loaded
+ * @returns the loaded campaign
 
    this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
@@ -264,6 +264,6 @@
 
 /**
-   \brief handle keyboard commands
-   \param event the event to handle
+ *  handle keyboard commands
+ * @param event the event to handle
 */
 void GameLoader::process(const Event& event)
@@ -322,6 +322,6 @@
 
 /**
-   \brief load a StoryEntity
-   \param element a XMLElement containing all the needed info
+ *  load a StoryEntity
+ * @param element a XMLElement containing all the needed info
 */
 BaseObject* GameLoader::fabricate(const TiXmlElement* element)
Index: orxonox/trunk/src/util/loading/game_loader.h
===================================================================
--- orxonox/trunk/src/util/loading/game_loader.h	(revision 4834)
+++ orxonox/trunk/src/util/loading/game_loader.h	(revision 4836)
@@ -1,5 +1,5 @@
 /*!
     \file game_loader.h
-    \brief loads campaigns, worlds and all other story_entities
+  *  loads campaigns, worlds and all other story_entities
 */
 
@@ -57,5 +57,5 @@
   void previousLevel();
 
-  /** \brief a world command to send to the GameLoader \param cmd the command */
+  /** \brief a world command to send to the GameLoader @param cmd the command */
   bool worldCommand(Command* cmd);
   ErrorMessage loadDebugCampaign(Uint32 campaignID);
Index: orxonox/trunk/src/util/loading/load_param.cc
===================================================================
--- orxonox/trunk/src/util/loading/load_param.cc	(revision 4834)
+++ orxonox/trunk/src/util/loading/load_param.cc	(revision 4836)
@@ -22,10 +22,10 @@
 
 /**
-   \param object The object this Parameter is loaded too.
-   \param root: the XML-element to load this option from.
-   \param paramName: The name of the parameter loaded.
-   \param paramCount: how many parameters this loading-function takes
-   \param multi: if false LoadParam assumes only one occurence of this parameter in root, if true it assumes multiple occurences.
-   \param ...: the parameter information (1. Parameter, 2. Default Value for the Parameter, ...)
+ * @param object The object this Parameter is loaded too.
+ * @param root: the XML-element to load this option from.
+ * @param paramName: The name of the parameter loaded.
+ * @param paramCount: how many parameters this loading-function takes
+ * @param multi: if false LoadParam assumes only one occurence of this parameter in root, if true it assumes multiple occurences.
+ * @param ...: the parameter information (1. Parameter, 2. Default Value for the Parameter, ...)
 */
 BaseLoadParam::BaseLoadParam(const TiXmlElement* root, BaseObject* object, const char* paramName,
@@ -152,6 +152,6 @@
 
 /**
-   \param descriptionText The text to set as a description for this Parameter
-   \returns a pointer to itself.
+ * @param descriptionText The text to set as a description for this Parameter
+ * @returns a pointer to itself.
 */
 BaseLoadParam* BaseLoadParam::describe(const char* descriptionText)
@@ -165,5 +165,5 @@
 
 /**
-   \param paramName the name of the parameter to load
+ * @param paramName the name of the parameter to load
 */
 LoadParamDescription::LoadParamDescription(const char* paramName)
@@ -177,5 +177,5 @@
 
 /**
-   \brief removes all the alocated memory
+ *  removes all the alocated memory
 */
 LoadParamDescription::~LoadParamDescription()
@@ -197,5 +197,5 @@
 
 /**
-   \param descriptionText The text to set as a description for this Parameter
+ * @param descriptionText The text to set as a description for this Parameter
 */
 void LoadParamDescription::setDescription(const char* descriptionText)
@@ -206,5 +206,5 @@
 
 /**
-   \brief prints out this parameter, its input method and the description (if availiable)
+ *  prints out this parameter, its input method and the description (if availiable)
 */
 void LoadParamDescription::print() const
@@ -243,15 +243,15 @@
 
 /**
-   \brief A list, that holds all the classes that are loadable (classes not objects!!)
+ *  A list, that holds all the classes that are loadable (classes not objects!!)
 */
 tList<LoadClassDescription>* LoadClassDescription::classList = new tList<LoadClassDescription>;
 
 /**
-   \brief if the description of Parameters should be executed
+ *  if the description of Parameters should be executed
 */
 bool LoadClassDescription::parametersDescription = true;
 
 /**
-   \param className the name of the class to be loadable
+ * @param className the name of the class to be loadable
 */
 LoadClassDescription::LoadClassDescription(const char* className)
@@ -266,5 +266,5 @@
 
 /**
-   \brief deletes a classDescription (deletes all the parameterDescriptions as well
+ *  deletes a classDescription (deletes all the parameterDescriptions as well
 */
 LoadClassDescription::~LoadClassDescription()
@@ -283,6 +283,6 @@
 
 /**
-   \brief adds a class to the list of loadable classes
-   \param className The name of the class to add
+ *  adds a class to the list of loadable classes
+ * @param className The name of the class to add
 
    this function searches for the className string, and if found just returns the appropriate Class.
@@ -308,6 +308,6 @@
 
 /**
-   \brief does the same as addClass(const char* className), but with params
-   \param paramName the name of the parameter to add.
+ *  does the same as addClass(const char* className), but with params
+ * @param paramName the name of the parameter to add.
 */
 LoadParamDescription* LoadClassDescription::addParam(const char* paramName)
@@ -331,5 +331,5 @@
 
 /**
-   \brief prints out all loadable Classes, and their parameters
+ *  prints out all loadable Classes, and their parameters
 */
 void LoadClassDescription::printAll(const char* fileName)
@@ -361,7 +361,7 @@
 
 /**
-   \param root: The XML-element to grab a parameter from
-   \param parameterName: the parameter to grab
-   \returns the Value of the parameter if found, NULL otherwise
+ * @param root: The XML-element to grab a parameter from
+ * @param parameterName: the parameter to grab
+ * @returns the Value of the parameter if found, NULL otherwise
 */
 const char* grabParameter(const TiXmlElement* root, const char* parameterName)
Index: orxonox/trunk/src/util/loading/load_param.h
===================================================================
--- orxonox/trunk/src/util/loading/load_param.h	(revision 4834)
+++ orxonox/trunk/src/util/loading/load_param.h	(revision 4836)
@@ -16,5 +16,5 @@
 /*!
     \file load_param.h
-    \brief A Class and macro-functions, that makes our lives easy to load-in parameters
+  *  A Class and macro-functions, that makes our lives easy to load-in parameters
 */
 
@@ -111,6 +111,6 @@
 // 1. TYPE
 /**
-   \brief a Macro to easily implement many different Constructors for the LoadParam-Class with 1 argument
-   \param type1 The type of the first functionParameter
+ *  a Macro to easily implement many different Constructors for the LoadParam-Class with 1 argument
+ * @param type1 The type of the first functionParameter
 */
 #define LoadParam1(type1) \
@@ -128,7 +128,7 @@
 // 2. TYPES
 /**
-   \brief a Macro to easily implement many different Constructors for the LoadParam-Class with 2 arguments
-   \param type1 The type of the first functionParameter
-   \param type2 The type of the second functionParameter
+ *  a Macro to easily implement many different Constructors for the LoadParam-Class with 2 arguments
+ * @param type1 The type of the first functionParameter
+ * @param type2 The type of the second functionParameter
 */
 #define LoadParam2(type1, type2) \
@@ -153,8 +153,8 @@
 // 3. TYPES
 /**
-   \brief a Macro to easily implement many different Constructors for the LoadParam-Class with 3 arguments
-   \param type1 The type of the first functionParameter
-   \param type2 The type of the second functionParameter
-   \param type3 The type of the third functionParameter
+ *  a Macro to easily implement many different Constructors for the LoadParam-Class with 3 arguments
+ * @param type1 The type of the first functionParameter
+ * @param type2 The type of the second functionParameter
+ * @param type3 The type of the third functionParameter
 */
 #define LoadParam3(type1, type2, type3) \
@@ -179,9 +179,9 @@
 // 4. TYPES
 /**
-   \brief a Macro to easily implement many different Constructors for the LoadParam-Class with 4 arguments
-   \param type1 The type of the first functionParameter
-   \param type2 The type of the second functionParameter
-   \param type3 The type of the third functionParameter
-   \param type4 The type of the forth functionParameter
+ *  a Macro to easily implement many different Constructors for the LoadParam-Class with 4 arguments
+ * @param type1 The type of the first functionParameter
+ * @param type2 The type of the second functionParameter
+ * @param type3 The type of the third functionParameter
+ * @param type4 The type of the forth functionParameter
 */
 #define LoadParam4(type1, type2, type3, type4) \
@@ -208,10 +208,10 @@
 // 5. TYPES
 /**
-   \brief a Macro to easily implement many different Constructors for the LoadParam-Class with 5 arguments
-   \param type1 The type of the first functionParameter
-   \param type2 The type of the second functionParameter
-   \param type3 The type of the third functionParameter
-   \param type4 The type of the forth functionParameter
-   \param type5 The type of the fifth functionParameter
+ *  a Macro to easily implement many different Constructors for the LoadParam-Class with 5 arguments
+ * @param type1 The type of the first functionParameter
+ * @param type2 The type of the second functionParameter
+ * @param type3 The type of the third functionParameter
+ * @param type4 The type of the forth functionParameter
+ * @param type5 The type of the fifth functionParameter
 */
 #define LoadParam5(type1, type2, type3, type4, type5) \
@@ -238,6 +238,6 @@
 // Pointer TYPE
 /**
-   \brief a Macro to easily implement many different Constructors for the LoadParam-Class with one Pointer argument
-   \param type1 The type of the Pointer
+ *  a Macro to easily implement many different Constructors for the LoadParam-Class with one Pointer argument
+ * @param type1 The type of the Pointer
  */
 #define LoadParamPT(type1) \
@@ -276,5 +276,5 @@
 
   void setDescription(const char* descriptionText);
-  /** \returns the descriptionString */
+  /** @returns the descriptionString */
   const char* getDescription() { return this->description; };
 
