summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-17 10:31:03 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-17 10:31:03 +0300
commit9cdbed6c562f95e24e02f49630386f8b18884a02 (patch)
tree4dad8316607387c80b66cf42b2a806ffa1a3afed /src/game.cpp
parent3a7313c027407e3b35360a021c72fe78f181d81d (diff)
downloadmv-9cdbed6c562f95e24e02f49630386f8b18884a02.tar.gz
mv-9cdbed6c562f95e24e02f49630386f8b18884a02.tar.bz2
mv-9cdbed6c562f95e24e02f49630386f8b18884a02.tar.xz
mv-9cdbed6c562f95e24e02f49630386f8b18884a02.zip
Remove getter for gameHandler.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 025f4c6d1..b57b02f2c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -150,7 +150,7 @@ static void initEngines()
particleEngine->setupEngine();
BeingInfo::init();
- Net::getGameHandler()->initEngines();
+ gameHandler->initEngines();
keyboard.update();
if (joystick)
@@ -402,7 +402,7 @@ Game::Game() :
if (actorManager)
actorManager->setPlayer(localPlayer);
- Net::getGameHandler()->ping(tick_time);
+ gameHandler->ping(tick_time);
if (setupWindow)
setupWindow->setInGame(true);
@@ -619,7 +619,7 @@ void Game::slowLogic()
PacketCounters::update();
// Handle network stuff
- if (!Net::getGameHandler()->isConnected())
+ if (!gameHandler->isConnected())
{
if (client->getState() == STATE_CHANGE_MAP)
return; // Not a problem here
@@ -655,11 +655,11 @@ void Game::slowLogic()
}
else
{
- if (Net::getGameHandler()->mustPing()
+ if (gameHandler->mustPing()
&& get_elapsed_time1(mPing) > 3000)
{
mPing = tick_time;
- Net::getGameHandler()->ping(tick_time);
+ gameHandler->ping(tick_time);
}
if (mAdjustPerfomance)
@@ -1055,7 +1055,7 @@ void Game::changeMap(const std::string &mapPath)
if (localPlayer)
localPlayer->recreateItemParticles();
- Net::getGameHandler()->mapLoadedEvent();
+ gameHandler->mapLoadedEvent();
BLOCK_END("Game::changeMap")
}