summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-26 01:06:59 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-26 16:44:05 +0300
commit52145379e45bf92a5dd6b9aaa961eb65da9749a1 (patch)
tree27cb2358a240baf78c69f70a7db999ef04599f57 /src/resources
parentc558d40b8515202c37ba749d9ecd0c3cc4385ef4 (diff)
downloadmv-52145379e45bf92a5dd6b9aaa961eb65da9749a1.tar.gz
mv-52145379e45bf92a5dd6b9aaa961eb65da9749a1.tar.bz2
mv-52145379e45bf92a5dd6b9aaa961eb65da9749a1.tar.xz
mv-52145379e45bf92a5dd6b9aaa961eb65da9749a1.zip
Revert "Add CilkPlus support into map.cpp"
This reverts commit 30da377919524a96a385cbe16f8ab74d5a4a7fab. This commit improve performance only a bit but heavy use all cores.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/map/map.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index c7eed522d..18e3dc7f5 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -331,7 +331,7 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY)
// Make sure actors are sorted ascending by Y-coordinate
// so that they overlap correctly
BLOCK_START("Map::draw sort")
- cilk_spawn mActors.sort(actorCompare);
+ mActors.sort(actorCompare);
BLOCK_END("Map::draw sort")
// update scrolling of all ambient layers
@@ -379,8 +379,6 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY)
}
#endif
- cilk_sync;
-
if (mDrawLayersFlags == MapType::SPECIAL3
|| mDrawLayersFlags == MapType::SPECIAL4
|| mDrawLayersFlags == MapType::BLACKWHITE)