mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 19:37:02 +00:00
Merge branch 'master' into 303
Conflicts: src/game/Player.cpp src/shared/revision_nr.h
This commit is contained in:
commit
ef69f6b80c
21 changed files with 110 additions and 46 deletions
|
|
@ -125,6 +125,9 @@ World::~World()
|
|||
|
||||
m_weathers.clear();
|
||||
|
||||
while (!cliCmdQueue.empty())
|
||||
delete cliCmdQueue.next();
|
||||
|
||||
VMAP::VMapFactory::clear();
|
||||
|
||||
if(m_resultQueue) delete m_resultQueue;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue