Changeset 1524 for code/branches/input/src/orxonox/Orxonox.cc
- Timestamp:
- Jun 3, 2008, 12:20:36 AM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/input/src/orxonox/Orxonox.cc
r1519 r1524 57 57 #include "core/Debug.h" 58 58 #include "core/Loader.h" 59 #include "core/Tickable.h"60 59 #include "core/input/InputManager.h" 61 60 #include "core/TclBind.h" 61 #include "core/Core.h" 62 62 63 63 // audio … … 70 70 // objects and tools 71 71 #include "hud/HUD.h" 72 #include <Ogre.h>72 #include "objects/Tickable.h" 73 73 74 74 #include "GraphicsEngine.h" … … 76 76 // FIXME: is this really file scope? 77 77 // globals for the server or client 78 network::Client *client_g ;79 network::Server *server_g ;78 network::Client *client_g = 0; 79 network::Server *server_g = 0; 80 80 81 81 namespace orxonox … … 430 430 } 431 431 432 // tick the core 433 Core::tick((float)evt.timeSinceLastFrame); 432 434 // Call those objects that need the real time 433 435 for (Iterator<TickableReal> it = ObjectList<TickableReal>::start(); it; ++it) … … 436 438 for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it) 437 439 it->tick((float)evt.timeSinceLastFrame * this->timefactor_); 440 //AudioManager::tick(); 441 if (client_g) 442 client_g->tick((float)evt.timeSinceLastFrame); 443 if (server_g) 444 server_g->tick((float)evt.timeSinceLastFrame); 438 445 439 446 // don't forget to call _fireFrameStarted in ogre to make sure
Note: See TracChangeset
for help on using the changeset viewer.