AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-30 08:35:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Client] Update debug in CellStore

Browse Source
This commit is contained in:
David Cernat 2017-06-02 05:26:07 +03:00
parent d0a0b6ffa4
commit 75a60a4700
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
apps/openmw/mwworld/cellstore.cpp
View File

@ -241,16 +241,23 @@ namespace MWWorld
{ {
// A cell we had previously moved an object to is returning it to us. // A cell we had previously moved an object to is returning it to us.
// tes3mp debug start /*
if (found->second != from) { Start of tes3mp addition
printf("Storage: %s owned %s which it gave to %s which isn't %s therefore CRASH\n", Add extra debug for multiplayer purposes
*/
if (found->second != from)
{
LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Storage: %s owned %s which it gave to %s which isn't %s, which should result in a crash\n",
this->getCell()->getDescription().c_str(), this->getCell()->getDescription().c_str(),
object.getBase()->mRef.getRefId().c_str(), object.getBase()->mRef.getRefId().c_str(),
found->second->getCell()->getDescription().c_str(), found->second->getCell()->getDescription().c_str(),
from->getCell()->getDescription().c_str()); from->getCell()->getDescription().c_str());
} }
// tes3mp debug end /*
End of tes3mp addition
*/
assert (found->second == from); assert (found->second == from);
mMovedToAnotherCell.erase(found); mMovedToAnotherCell.erase(found);
@ -281,8 +288,11 @@ namespace MWWorld
// Objects with no refnum can't be handled correctly in the merging process that happens // Objects with no refnum can't be handled correctly in the merging process that happens
// on a save/load, so do a simple copy & delete for these objects. // on a save/load, so do a simple copy & delete for these objects.
// The code below is disabled for tes3mp for as long as player objects lack refnums, /*
// because it will break exterior cell transitions for them Start of tes3mp change (major)
Disable the following code because it breaks DedicatedPlayers
*/
/* /*
if (!object.getCellRef().getRefNum().hasContentFile()) if (!object.getCellRef().getRefNum().hasContentFile())
{ {
@ -292,6 +302,9 @@ namespace MWWorld
return copied; return copied;
} }
*/ */
/*
End of tes3mp change (major)
*/
MovedRefTracker::iterator found = mMovedHere.find(object.getBase()); MovedRefTracker::iterator found = mMovedHere.find(object.getBase());
if (found != mMovedHere.end()) if (found != mMovedHere.end())
@ -307,13 +320,19 @@ namespace MWWorld
// Now that object is back to its rightful owner, we can move it // Now that object is back to its rightful owner, we can move it
if (cellToMoveTo != originalCell) if (cellToMoveTo != originalCell)
{ {
// tes3mp debug start /*
printf("Storage: %s's original cell %s gives it from %s to %s\n", Start of tes3mp addition
Add extra debug for multiplayer purposes
*/
LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Storage: %s's original cell %s gives it from %s to %s\n",
object.getBase()->mRef.getRefId().c_str(), object.getBase()->mRef.getRefId().c_str(),
originalCell->getCell()->getDescription().c_str(), originalCell->getCell()->getDescription().c_str(),
this->getCell()->getDescription().c_str(), this->getCell()->getDescription().c_str(),
cellToMoveTo->getCell()->getDescription().c_str()); cellToMoveTo->getCell()->getDescription().c_str());
// tes3mp debug end /*
End of tes3mp addition
*/
originalCell->moveTo(object, cellToMoveTo); originalCell->moveTo(object, cellToMoveTo);
} }