mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:53:52 +00:00
Code Issues Releases Wiki Activity

[Client] Fix invalid read (memcheck warning)

Browse source
This commit is contained in:
Koncord 2017-12-04 16:25:57 +08:00
parent 2bc79fcdf4
commit cd03d59056
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -1333,7 +1333,7 @@ void LocalPlayer::clearCurrentContainer()
currentContainer.mpNum = 0; currentContainer.mpNum = 0;
} }
void LocalPlayer::storeCellState(ESM::Cell cell, int stateType) void LocalPlayer::storeCellState(const ESM::Cell& cell, int stateType)
{ {
std::vector<CellState>::iterator iter; std::vector<CellState>::iterator iter;

2
apps/openmw/mwmp/LocalPlayer.hpp
View file

@ -84,8 +84,8 @@ namespace mwmp
void clearCellStates(); void clearCellStates();
void clearCurrentContainer(); void clearCurrentContainer();
void storeCellState(ESM::Cell cell, int stateType);
void storeCurrentContainer(const MWWorld::Ptr& container); void storeCurrentContainer(const MWWorld::Ptr& container);
void storeCellState(const ESM::Cell& cell, int stateType);
private: private:
Networking *getNetworking(); Networking *getNetworking();

20
apps/openmw/mwworld/scene.cpp
View file

@ -261,16 +261,6 @@ namespace MWWorld
mPhysics->removeHeightField ((*iter)->getCell()->getGridX(), (*iter)->getCell()->getGridY()); mPhysics->removeHeightField ((*iter)->getCell()->getGridX(), (*iter)->getCell()->getGridY());
} }
MWBase::Environment::get().getMechanicsManager()->drop (*iter);
mRendering.removeCell(*iter);
MWBase::Environment::get().getWindowManager()->removeCell(*iter);
MWBase::Environment::get().getWorld()->getLocalScripts().clearCell (*iter);
MWBase::Environment::get().getSoundManager()->stopSound (*iter);
mActiveCells.erase(*iter);
/* /*
Start of tes3mp addition Start of tes3mp addition
@ -280,6 +270,16 @@ namespace MWWorld
/* /*
End of tes3mp addition End of tes3mp addition
*/ */
MWBase::Environment::get().getMechanicsManager()->drop (*iter);
mRendering.removeCell(*iter);
MWBase::Environment::get().getWindowManager()->removeCell(*iter);
MWBase::Environment::get().getWorld()->getLocalScripts().clearCell (*iter);
MWBase::Environment::get().getSoundManager()->stopSound (*iter);
mActiveCells.erase(*iter);
} }
void Scene::loadCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn) void Scene::loadCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn)