Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Core/MapUpdate): switch from ACE_Method_Request to PCQ #3459

Merged
merged 11 commits into from
Nov 13, 2020
Merged

feat(Core/MapUpdate): switch from ACE_Method_Request to PCQ #3459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7cdec3e
feat(Core/MapUpdate): switch from ACE_Method_Request to PCQ
Winfidonarleyan Sep 9, 2020
615a813
del useless debug logs
Winfidonarleyan Sep 10, 2020
07c2126
move #include <thread> to header file
Winfidonarleyan Sep 10, 2020
b188898
Merge remote-tracking branch 'off/master' into ace-method-request
Winfidonarleyan Sep 12, 2020
6cf6d7d
Merge branch 'master' into ace-method-request
Viste Sep 13, 2020
c55390b
Merge branch 'master' into ace-method-request
Viste Sep 13, 2020
e35bc81
Merge branch 'master' into ace-method-request
Viste Nov 11, 2020
0736836
Merge branch 'master' into ace-method-request
Viste Nov 12, 2020
507cfc8
Merge branch 'master' into ace-method-request
Viste Nov 13, 2020
71b8f94
Merge branch 'master' into ace-method-request
Viste Nov 13, 2020
6b83f30
Merge branch 'master' into ace-method-request
Si1ker Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 0 additions & 121 deletions src/common/Threading/DelayExecutor.cpp
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions src/common/Threading/DelayExecutor.h
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions src/server/game/Maps/Map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,11 +708,9 @@ void Map::VisitNearbyCellsOf(WorldObject* obj, TypeContainerVisitor<acore::Objec

void Map::Update(const uint32 t_diff, const uint32 s_diff, bool /*thread*/)
{
uint32 mapId = GetId(); // pussywizard: for crashlogs
sLog->outDebug(LOG_FILTER_POOLSYS, "%u", mapId); // pussywizard: for crashlogs

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

sLog->outDebug(LOG_FILTER_POOLSYS, "%u", mapId); // pussywizard: for crashlogs

in end of func

if (t_diff)
_dynamicTree.update(t_diff);

/// update worldsessions for existing players
for (m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter)
{
Expand Down Expand Up @@ -837,8 +835,6 @@ void Map::Update(const uint32 t_diff, const uint32 s_diff, bool /*thread*/)
sScriptMgr->OnMapUpdate(this, t_diff);

BuildAndSendUpdateForObjects(); // pussywizard

sLog->outDebug(LOG_FILTER_POOLSYS, "%u", mapId); // pussywizard: for crashlogs
}

void Map::HandleDelayedVisibility()
Expand Down
6 changes: 3 additions & 3 deletions src/server/game/Maps/MapManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ void MapManager::Initialize()
{
int num_threads(sWorld->getIntConfig(CONFIG_NUMTHREADS));

// Start mtmaps if needed.
if (num_threads > 0 && m_updater.activate(num_threads) == -1)
abort();
// Start mtmaps if needed
if (num_threads > 0)
m_updater.activate(num_threads);
}

void MapManager::InitializeVisibilityDistanceInfo()
Expand Down
Loading