Changeset 4766 in orxonox.OLD for orxonox/trunk/src/orxonox.h

Timestamp:

Jul 2, 2005, 11:54:41 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: cleaned up orxonox.cc a bit, and now one has the ability to choose the resolution in the GUI

File:

• orxonox/trunk/src/orxonox.h (modified) (5 diffs)

orxonox/trunk/src/orxonox.h

@@ -1 @@
-/*! 
+/*!
     \file orxonox.h
     \brief Orxonox core functions
-*/ 
+*/
 
 #ifndef _ORXONOX_H
@@ -15 +15 @@
 class EventHandler;
 class Event;
+class IniParser;
 
 //! Orxonox core singleton class
@@ -22 +23 @@
 
  public:
-  static Orxonox* getInstance ();
   virtual ~Orxonox ();
+  /** \returns a Pointer to the only object of this Class */
+  inline static Orxonox* getInstance() { if (!singletonRef) singletonRef = new Orxonox();  return singletonRef; };
+
   int init (int argc, char** argv);
 
@@ -34 +37 @@
   Orxonox ();
 
+  void parseIniFile(const char* fileName);
+
   int initVideo ();
   int initSound ();
@@ -40 +45 @@
   int initResources ();
 
-  void getConfigFile (int argc, char** argv);
+  const char* getConfigFile (int argc, char** argv);
 
  private:
   static Orxonox*   singletonRef;            //!< singleton reference to orxonox
 
-  char              configfilename[256];     //!< Filename of the configuration-file.
+  IniParser*        iniParser;               //!< Reference to the ini-parser used in orxonox
+  char              configFileName[256];     //!< Filename of the configuration-file.
   GameLoader*       gameLoader;              //!< The gameLoader
   ResourceManager*  resourceManager;         //!< The ResourceManager
   ObjectManager*    objectManager;           //!< the object manager of the game
   EventHandler*     eventHandler;            //!< the eventhandler of orxonox is created here
-  
+
   unsigned int      argc;                    //!< Count of Arguments of orxonox
   char**            argv;                    //!< Values of th Arguments of orxonox.