summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-26 00:15:22 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-26 16:43:59 +0300
commit8d52054793fea7819dbe346b1d8d68fb3a4ef865 (patch)
treef32f1fd1d63e0b8599fdfda41f4d078776e0354b
parent5eb23937905ba250094a0eaf50f351e1046112b1 (diff)
downloadmanaplus-8d52054793fea7819dbe346b1d8d68fb3a4ef865.tar.gz
manaplus-8d52054793fea7819dbe346b1d8d68fb3a4ef865.tar.bz2
manaplus-8d52054793fea7819dbe346b1d8d68fb3a4ef865.tar.xz
manaplus-8d52054793fea7819dbe346b1d8d68fb3a4ef865.zip
Use cilkplus in game.cpp
-rw-r--r--src/being/actorsprite.cpp4
-rw-r--r--src/being/actorsprite.h2
-rw-r--r--src/game.cpp14
3 files changed, 7 insertions, 13 deletions
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index 9055e3a40..88418be1a 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -131,10 +131,6 @@ void ActorSprite::logic()
BLOCK_END("ActorSprite::logic")
}
-void ActorSprite::actorLogic()
-{
-}
-
void ActorSprite::setMap(Map *const map)
{
Actor::setMap(map);
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index 12af84cda..7b5da3aa7 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -70,8 +70,6 @@ class ActorSprite notfinal : public CompoundSprite, public Actor
virtual void logic();
- static void actorLogic();
-
void setMap(Map *const map) override;
/**
diff --git a/src/game.cpp b/src/game.cpp
index 1e4d838e3..921c69cc3 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -587,7 +587,6 @@ void Game::logic()
handleInput();
// Handle all necessary game logic
- ActorSprite::actorLogic();
if (actorManager)
actorManager->logic();
if (particleEngine)
@@ -622,7 +621,7 @@ void Game::slowLogic()
whoIsOnline->slowLogic();
Being::reReadConfig();
if (killStats)
- killStats->recalcStats();
+ cilk_spawn killStats->recalcStats();
if (time > mTime2 || mTime2 - time > 10)
{
@@ -632,20 +631,21 @@ void Game::slowLogic()
}
}
+ if (mainGraphics->getOpenGL())
+ DelayedManager::delayedLoad();
+
#ifdef TMWA_SUPPORT
if (shopWindow)
- shopWindow->updateTimes();
+ cilk_spawn shopWindow->updateTimes();
#endif
- if (mainGraphics->getOpenGL())
- DelayedManager::delayedLoad();
#ifdef TMWA_SUPPORT
if (guildManager)
guildManager->slowLogic();
#endif
if (skillDialog)
- skillDialog->slowLogic();
+ cilk_spawn skillDialog->slowLogic();
- PacketCounters::update();
+ cilk_spawn PacketCounters::update();
// Handle network stuff
if (!gameHandler->isConnected())