mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8031] Move player update code to Map::Update.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Ambal 2009-06-17 01:55:44 +04:00 • committed by VladimirMangos
parent 7024862b82
commit 2b69a914cf
5 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/game/Map.cpp
View file

@ -550,6 +550,15 @@ bool Map::loaded(const GridPair &p) const
void Map::Update(const uint32 &t_diff) void Map::Update(const uint32 &t_diff)
{ {
/// update players at tick
for(m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter)
{
Player* plr = m_mapRefIter->getSource();
if(plr && plr->IsInWorld())
plr->Update(t_diff);
}
/// update active cells around players and active objects
resetMarkedCells(); resetMarkedCells();
MaNGOS::ObjectUpdater updater(t_diff); MaNGOS::ObjectUpdater updater(t_diff);

2
src/game/MapManager.cpp
View file

@ -250,8 +250,6 @@ MapManager::Update(uint32 diff)
if( !i_timer.Passed() ) if( !i_timer.Passed() )
return; return;
ObjectAccessor::Instance().UpdatePlayers(i_timer.GetCurrent());
for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter) for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
{ {
checkAndCorrectGridStatesArray(); // debugging code, should be deleted some day checkAndCorrectGridStatesArray(); // debugging code, should be deleted some day

9
src/game/ObjectAccessor.cpp
View file

@ -405,15 +405,6 @@ ObjectAccessor::Update(uint32 diff)
} }
} }
void
ObjectAccessor::UpdatePlayers(uint32 diff)
{
HashMapHolder<Player>::MapType& playerMap = HashMapHolder<Player>::GetContainer();
for(HashMapHolder<Player>::MapType::iterator iter = playerMap.begin(); iter != playerMap.end(); ++iter)
if(iter->second->IsInWorld())
iter->second->Update(diff);
}
void void
ObjectAccessor::WorldObjectChangeAccumulator::Visit(PlayerMapType &m) ObjectAccessor::WorldObjectChangeAccumulator::Visit(PlayerMapType &m)
{ {

1
src/game/ObjectAccessor.h
View file

@ -186,7 +186,6 @@ class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor,
} }
void Update(uint32 diff); void Update(uint32 diff);
void UpdatePlayers(uint32 diff);
Corpse* GetCorpseForPlayerGUID(uint64 guid); Corpse* GetCorpseForPlayerGUID(uint64 guid);
void RemoveCorpse(Corpse *corpse); void RemoveCorpse(Corpse *corpse);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8030" #define REVISION_NR "8031"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__