diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp index 31e5273ef..a52a6c8d1 100644 --- a/apps/openmw/mwmp/Networking.cpp +++ b/apps/openmw/mwmp/Networking.cpp @@ -745,7 +745,8 @@ void Networking::processWorldPacket(RakNet::Packet *packet) if (!ptrCellStore) return; - LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Received ID_CONTAINER"); + LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Received ID_CONTAINER about %s", + event->cell.getDescription().c_str()); LOG_APPEND(Log::LOG_VERBOSE, "- action: %i", event->action); // If we've received a request for information, comply with it @@ -763,7 +764,8 @@ void Networking::processWorldPacket(RakNet::Packet *packet) if (!ptrCellStore) return; - LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_PLACE"); + LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_PLACE about %s", + event->cell.getDescription().c_str()); event->placeObjects(ptrCellStore); break; @@ -774,7 +776,8 @@ void Networking::processWorldPacket(RakNet::Packet *packet) if (!ptrCellStore) return; - LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_DELETE"); + LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_DELETE about %s", + event->cell.getDescription().c_str()); event->deleteObjects(ptrCellStore); break; @@ -785,7 +788,8 @@ void Networking::processWorldPacket(RakNet::Packet *packet) if (!ptrCellStore) return; - LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_LOCK"); + LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_LOCK about %s", + event->cell.getDescription().c_str()); event->lockObjects(ptrCellStore); break; @@ -796,7 +800,8 @@ void Networking::processWorldPacket(RakNet::Packet *packet) if (!ptrCellStore) return; - LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_UNLOCK"); + LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_UNLOCK about %s", + event->cell.getDescription().c_str()); event->unlockObjects(ptrCellStore); break; @@ -807,7 +812,8 @@ void Networking::processWorldPacket(RakNet::Packet *packet) if (!ptrCellStore) return; - LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "%s", "Received ID_OBJECT_SCALE"); + LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "%s", "Received ID_OBJECT_SCALE about %s", + event->cell.getDescription().c_str()); event->scaleObjects(ptrCellStore); break; @@ -818,7 +824,8 @@ void Networking::processWorldPacket(RakNet::Packet *packet) if (!ptrCellStore) return; - LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_MOVE"); + LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_MOVE about %s", + event->cell.getDescription().c_str()); event->moveObjects(ptrCellStore); break; @@ -829,7 +836,8 @@ void Networking::processWorldPacket(RakNet::Packet *packet) if (!ptrCellStore) return; - LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_ROTATE"); + LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_ROTATE about %s", + event->cell.getDescription().c_str()); event->rotateObjects(ptrCellStore); break; @@ -840,7 +848,8 @@ void Networking::processWorldPacket(RakNet::Packet *packet) if (!ptrCellStore) return; - LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_ANIM_PLAY"); + LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_ANIM_PLAY about %s", + event->cell.getDescription().c_str()); event->animateObjects(ptrCellStore); break; @@ -851,7 +860,8 @@ void Networking::processWorldPacket(RakNet::Packet *packet) if (!ptrCellStore) return; - LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_DOOR_STATE"); + LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_DOOR_STATE about %s", + event->cell.getDescription().c_str()); event->activateDoors(ptrCellStore); break; @@ -862,7 +872,8 @@ void Networking::processWorldPacket(RakNet::Packet *packet) if (!ptrCellStore) return; - LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_SCRIPT_LOCAL_SHORT"); + LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_SCRIPT_LOCAL_SHORT about %s", + event->cell.getDescription().c_str()); event->setLocalShorts(ptrCellStore); break; @@ -873,7 +884,8 @@ void Networking::processWorldPacket(RakNet::Packet *packet) if (!ptrCellStore) return; - LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_SCRIPT_LOCAL_FLOAT"); + LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_SCRIPT_LOCAL_FLOAT about %s", + event->cell.getDescription().c_str()); event->setLocalFloats(ptrCellStore); break; diff --git a/apps/openmw/mwmp/WorldEvent.cpp b/apps/openmw/mwmp/WorldEvent.cpp index 460b32897..0239cf1e7 100644 --- a/apps/openmw/mwmp/WorldEvent.cpp +++ b/apps/openmw/mwmp/WorldEvent.cpp @@ -85,10 +85,9 @@ void WorldEvent::editContainers(MWWorld::CellStore* cellStore) { worldObject = objectChanges.objects.at(i); - LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- cell: %s", + LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i", worldObject.refId.c_str(), - worldObject.refNumIndex, - cell.getDescription().c_str()); + worldObject.refNumIndex); MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex); @@ -165,10 +164,9 @@ void WorldEvent::placeObjects(MWWorld::CellStore* cellStore) { worldObject = objectChanges.objects.at(i); - LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- cell: %s\n- charge: %i\n- count: %i", + LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- charge: %i\n- count: %i", worldObject.refId.c_str(), worldObject.refNumIndex, - cell.getDescription().c_str(), worldObject.charge, worldObject.count); @@ -202,10 +200,9 @@ void WorldEvent::deleteObjects(MWWorld::CellStore* cellStore) { worldObject = objectChanges.objects.at(i); - LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- cell: %s", + LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i", worldObject.refId.c_str(), - worldObject.refNumIndex, - cell.getDescription().c_str()); + worldObject.refNumIndex); MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex); @@ -228,10 +225,9 @@ void WorldEvent::lockObjects(MWWorld::CellStore* cellStore) { worldObject = objectChanges.objects.at(i); - LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- cell: %s", + LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i", worldObject.refId.c_str(), - worldObject.refNumIndex, - cell.getDescription().c_str()); + worldObject.refNumIndex); MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex); @@ -254,10 +250,9 @@ void WorldEvent::unlockObjects(MWWorld::CellStore* cellStore) { worldObject = objectChanges.objects.at(i); - LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- cell: %s", + LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i", worldObject.refId.c_str(), - worldObject.refNumIndex, - cell.getDescription().c_str()); + worldObject.refNumIndex); MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex); @@ -280,10 +275,9 @@ void WorldEvent::scaleObjects(MWWorld::CellStore* cellStore) { worldObject = objectChanges.objects.at(i); - LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- cell: %s", + LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i", worldObject.refId.c_str(), - worldObject.refNumIndex, - cell.getDescription().c_str()); + worldObject.refNumIndex); MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex); @@ -306,10 +300,9 @@ void WorldEvent::moveObjects(MWWorld::CellStore* cellStore) { worldObject = objectChanges.objects.at(i); - LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- cell: %s", + LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i", worldObject.refId.c_str(), - worldObject.refNumIndex, - cell.getDescription().c_str()); + worldObject.refNumIndex); MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex); @@ -333,10 +326,9 @@ void WorldEvent::rotateObjects(MWWorld::CellStore* cellStore) { worldObject = objectChanges.objects.at(i); - LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- cell: %s", + LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i", worldObject.refId.c_str(), - worldObject.refNumIndex, - cell.getDescription().c_str()); + worldObject.refNumIndex); MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex); @@ -360,10 +352,9 @@ void WorldEvent::animateObjects(MWWorld::CellStore* cellStore) { worldObject = objectChanges.objects.at(i); - LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- cell: %s", + LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i", worldObject.refId.c_str(), - worldObject.refNumIndex, - cell.getDescription().c_str()); + worldObject.refNumIndex); MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex); @@ -387,10 +378,9 @@ void WorldEvent::activateDoors(MWWorld::CellStore* cellStore) { worldObject = objectChanges.objects.at(i); - LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- cell: %s", + LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i", worldObject.refId.c_str(), - worldObject.refNumIndex, - cell.getDescription().c_str()); + worldObject.refNumIndex); MWWorld::Ptr ptrFound = cellStore->searchExact(worldObject.refId, worldObject.refNumIndex); @@ -445,10 +435,9 @@ void WorldEvent::setLocalShorts(MWWorld::CellStore* cellStore) { worldObject = objectChanges.objects.at(i); - LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- cell: %s\n- index: %i\n- shortVal: %i", + LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- index: %i\n- shortVal: %i", worldObject.refId.c_str(), worldObject.refNumIndex, - cell.getDescription().c_str(), worldObject.index, worldObject.shortVal); @@ -473,10 +462,9 @@ void WorldEvent::setLocalFloats(MWWorld::CellStore* cellStore) { worldObject = objectChanges.objects.at(i); - LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- cell: %s\n- index: %i\n- floatVal: %f", + LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i\n- index: %i\n- floatVal: %f", worldObject.refId.c_str(), worldObject.refNumIndex, - cell.getDescription().c_str(), worldObject.index, worldObject.floatVal);