Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3238 in orxonox.OLD for orxonox/branches/sound/src/orxonox.h


Ignore:
Timestamp:
Dec 20, 2004, 2:42:54 AM (21 years ago)
Author:
bensch
Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/sound/src/orxonox.h

    r2636 r3238  
    44*/
    55
    6 #ifndef ORXONOX_H
    7 #define ORXONOX_H
    8 
    9 #include <SDL/SDL.h>
     6#ifndef _ORXONOX_H
     7#define _ORXONOX_H
    108
    119#include "stdincl.h"
    … …  
    2422
    2523 private:
    26   static Orxonox* singleton_ref;
     24  static Orxonox* singletonRef;
    2725  Orxonox ();
    2826  ~Orxonox ();
    … …  
    4038  Uint32 lastframe;
    4139 
    42   void get_config_file (int argc, char** argv);
     40  void getConfigFile (int argc, char** argv);
    4341 
    4442  // main loop functions
    45   void synchronize ();
    46   void handle_input ();
    47   void time_slice ();
    48   void collision ();
    49   void display ();
     43  //  void synchronize ();
     44  //void handle_input ();
     45  //void time_slice ();
     46  //void collision ();
     47  //void display ();
    5048 
    5149        // subsystem initialization
    52   int init_video ();
    53   int init_sound ();
    54   int init_input ();
    55   int init_networking ();
    56   int init_resources ();
    57   int init_world ();
     50  int initVideo ();
     51  int initSound ();
     52  int initInput ();
     53  int initNetworking ();
     54  int initResources ();
     55  int initWorld ();
    5856 
    5957 public:
    … …  
    6260  void quitGame();
    6361
    64   void event_handler (SDL_Event* event);
    65   bool system_command (Command* cmd);
     62  void eventHandler (SDL_Event* event);
     63  bool systemCommand (Command* cmd);
    6664
    6765  int init (int argc, char** argv);
    6866 
    69   CommandNode* get_localinput();
    70   Camera* get_camera();
    71   World* get_world();
     67  CommandNode* getLocalInput();
     68  Camera* getCamera();
     69  World* getWorld();
    7270 
    73   void mainLoop();
     71  //void mainLoop();
    7472};
    7573
    76 #endif
     74#endif /* _ORXONOX_H */
    7775
Note: See TracChangeset for help on using the changeset viewer.