diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2009-10-29 22:10:44 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2009-10-29 22:10:44 +0100 |
commit | a5943d58c2fd81cc24e06cc44b55852a217d7c62 (patch) | |
tree | 1f432909379be2e719229a9c4f8b93cf17e431ac /src/game.cpp | |
parent | c8bb01e2284b0570872be5f638b640d22ae247c8 (diff) | |
download | mana-client-a5943d58c2fd81cc24e06cc44b55852a217d7c62.tar.gz mana-client-a5943d58c2fd81cc24e06cc44b55852a217d7c62.tar.bz2 mana-client-a5943d58c2fd81cc24e06cc44b55852a217d7c62.tar.xz mana-client-a5943d58c2fd81cc24e06cc44b55852a217d7c62.zip |
Some random cleanups
Diffstat (limited to 'src/game.cpp')
-rw-r--r-- | src/game.cpp | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/src/game.cpp b/src/game.cpp index 644da530..ae079af2 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -317,50 +317,50 @@ Game::Game(): { done = false; - createGuiWindows(); - - mWindowMenu = new WindowMenu; - windowContainer->add(mWindowMenu); - - initEngines(); - - // Initialize logic and seconds counters - tick_time = 0; - mLogicCounterId = SDL_AddTimer(MILLISECONDS_IN_A_TICK, nextTick, NULL); - mSecondsCounterId = SDL_AddTimer(1000, nextSecond, NULL); - - // This part is eAthena specific - // For Manaserv, the map is obtained - // with the GPMSG_PLAYER_MAP_CHANGE flag. - map_path = map_path.substr(0, map_path.rfind(".")); - if (!map_path.empty()) - engine->changeMap(map_path); - - // Initialize beings - beingManager->setPlayer(player_node); - - /* - * To prevent the server from sending data before the client - * has initialized, I've modified it to wait for a "ping" - * from the client to complete its initialization - * - * Note: This only affects the latest eAthena version. This - * packet is handled by the older version, but its response - * is ignored by the client - */ - Net::getGameHandler()->ping(tick_time); - - // Initialize frame limiting - config.addListener("fpslimit", this); - optionChanged("fpslimit"); - - Joystick::init(); - // TODO: The user should be able to choose which one to use - // Open the first device - if (Joystick::getNumberOfJoysticks() > 0) - joystick = new Joystick(0); - - setupWindow->setInGame(true); + createGuiWindows(); + + mWindowMenu = new WindowMenu; + windowContainer->add(mWindowMenu); + + initEngines(); + + // Initialize logic and seconds counters + tick_time = 0; + mLogicCounterId = SDL_AddTimer(MILLISECONDS_IN_A_TICK, nextTick, NULL); + mSecondsCounterId = SDL_AddTimer(1000, nextSecond, NULL); + + // This part is eAthena specific + // For Manaserv, the map is obtained + // with the GPMSG_PLAYER_MAP_CHANGE flag. + map_path = map_path.substr(0, map_path.rfind(".")); + if (!map_path.empty()) + engine->changeMap(map_path); + + // Initialize beings + beingManager->setPlayer(player_node); + + /* + * To prevent the server from sending data before the client + * has initialized, I've modified it to wait for a "ping" + * from the client to complete its initialization + * + * Note: This only affects the latest eAthena version. This + * packet is handled by the older version, but its response + * is ignored by the client + */ + Net::getGameHandler()->ping(tick_time); + + // Initialize frame limiting + config.addListener("fpslimit", this); + optionChanged("fpslimit"); + + Joystick::init(); + // TODO: The user should be able to choose which one to use + // Open the first device + if (Joystick::getNumberOfJoysticks() > 0) + joystick = new Joystick(0); + + setupWindow->setInGame(true); } Game::~Game() |