From b39e3f518b544ce45ec5b382262381d1a3b76163 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Fri, 30 Nov 2018 23:38:16 +0200 Subject: [PATCH] [Client] Use correct log levels for inventory and dynamic record packets --- apps/openmw/mwmp/LocalPlayer.cpp | 6 +++--- apps/openmw/mwmp/Worldstate.cpp | 36 ++++++++++++++++---------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp index dabc28ee6..78e903d6c 100644 --- a/apps/openmw/mwmp/LocalPlayer.cpp +++ b/apps/openmw/mwmp/LocalPlayer.cpp @@ -1365,7 +1365,7 @@ void LocalPlayer::sendClass() void LocalPlayer::sendInventory() { - LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Sending entire inventory to server"); + LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending entire inventory to server"); MWWorld::Ptr ptrPlayer = getPlayerPtr(); MWWorld::InventoryStore &ptrInventory = ptrPlayer.getClass().getInventoryStore(ptrPlayer); @@ -1401,7 +1401,7 @@ void LocalPlayer::sendInventory() void LocalPlayer::sendItemChange(const MWWorld::Ptr& itemPtr, int count, unsigned int action) { - LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Sending item change for %s with action %i, count %i", + LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending item change for %s with action %i, count %i", itemPtr.getCellRef().getRefId().c_str(), action, count); inventoryChanges.items.clear(); @@ -1427,7 +1427,7 @@ void LocalPlayer::sendItemChange(const MWWorld::Ptr& itemPtr, int count, unsigne void LocalPlayer::sendItemChange(const std::string& refId, int count, unsigned int action) { - LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Sending item change for %s with action %i, count %i", + LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending item change for %s with action %i, count %i", refId.c_str(), action, count); inventoryChanges.items.clear(); diff --git a/apps/openmw/mwmp/Worldstate.cpp b/apps/openmw/mwmp/Worldstate.cpp index 63bde9349..cf2bda79f 100644 --- a/apps/openmw/mwmp/Worldstate.cpp +++ b/apps/openmw/mwmp/Worldstate.cpp @@ -35,7 +35,7 @@ Networking *Worldstate::getNetworking() void Worldstate::addRecords() { - LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Received ID_RECORD_DYNAMIC with %i records of type %i", + LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_RECORD_DYNAMIC with %i records of type %i", recordsCount, recordsType); if (recordsType == mwmp::RECORD_TYPE::SPELL) @@ -44,7 +44,7 @@ void Worldstate::addRecords() { bool hasBaseId = !record.baseId.empty(); - LOG_APPEND(Log::LOG_ERROR, "- spell record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), + LOG_APPEND(Log::LOG_INFO, "- spell record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), hasBaseId ? record.baseId.c_str() : "empty"); RecordHelper::overrideSpellRecord(record); @@ -56,7 +56,7 @@ void Worldstate::addRecords() { bool hasBaseId = !record.baseId.empty(); - LOG_APPEND(Log::LOG_ERROR, "- potion record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), + LOG_APPEND(Log::LOG_INFO, "- potion record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), hasBaseId ? record.baseId.c_str() : "empty"); RecordHelper::overridePotionRecord(record); @@ -68,7 +68,7 @@ void Worldstate::addRecords() { bool hasBaseId = !record.baseId.empty(); - LOG_APPEND(Log::LOG_ERROR, "- enchantment record %s, %i\n-- baseId is %s", record.data.mId.c_str(), record.data.mData.mType, + LOG_APPEND(Log::LOG_INFO, "- enchantment record %s, %i\n-- baseId is %s", record.data.mId.c_str(), record.data.mData.mType, hasBaseId ? record.baseId.c_str() : "empty"); RecordHelper::overrideEnchantmentRecord(record); @@ -80,7 +80,7 @@ void Worldstate::addRecords() { bool hasBaseId = !record.baseId.empty(); - LOG_APPEND(Log::LOG_ERROR, "- creature record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), + LOG_APPEND(Log::LOG_INFO, "- creature record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), hasBaseId ? record.baseId.c_str() : "empty"); RecordHelper::overrideCreatureRecord(record); @@ -92,7 +92,7 @@ void Worldstate::addRecords() { bool hasBaseId = !record.baseId.empty(); - LOG_APPEND(Log::LOG_ERROR, "- NPC record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), + LOG_APPEND(Log::LOG_INFO, "- NPC record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), hasBaseId ? record.baseId.c_str() : "empty"); RecordHelper::overrideNpcRecord(record); @@ -104,7 +104,7 @@ void Worldstate::addRecords() { bool hasBaseId = !record.baseId.empty(); - LOG_APPEND(Log::LOG_ERROR, "- armor record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), + LOG_APPEND(Log::LOG_INFO, "- armor record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), hasBaseId ? record.baseId.c_str() : "empty"); RecordHelper::overrideArmorRecord(record); @@ -116,7 +116,7 @@ void Worldstate::addRecords() { bool hasBaseId = !record.baseId.empty(); - LOG_APPEND(Log::LOG_ERROR, "- book record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), + LOG_APPEND(Log::LOG_INFO, "- book record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), hasBaseId ? record.baseId.c_str() : "empty"); RecordHelper::overrideBookRecord(record); @@ -128,7 +128,7 @@ void Worldstate::addRecords() { bool hasBaseId = !record.baseId.empty(); - LOG_APPEND(Log::LOG_ERROR, "- clothing record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), + LOG_APPEND(Log::LOG_INFO, "- clothing record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), hasBaseId ? record.baseId.c_str() : "empty"); RecordHelper::overrideClothingRecord(record); @@ -140,7 +140,7 @@ void Worldstate::addRecords() { bool hasBaseId = !record.baseId.empty(); - LOG_APPEND(Log::LOG_ERROR, "- miscellaneous record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), + LOG_APPEND(Log::LOG_INFO, "- miscellaneous record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), hasBaseId ? record.baseId.c_str() : "empty"); RecordHelper::overrideMiscellaneousRecord(record); @@ -152,7 +152,7 @@ void Worldstate::addRecords() { bool hasBaseId = !record.baseId.empty(); - LOG_APPEND(Log::LOG_ERROR, "- weapon record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), + LOG_APPEND(Log::LOG_INFO, "- weapon record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(), hasBaseId ? record.baseId.c_str() : "empty"); RecordHelper::overrideWeaponRecord(record); @@ -251,7 +251,7 @@ void Worldstate::sendEnchantmentRecord(const ESM::Enchantment* enchantment) { enchantmentRecords.clear(); - LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Sending ID_RECORD_DYNAMIC with enchantment"); + LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_RECORD_DYNAMIC with enchantment"); recordsType = mwmp::RECORD_TYPE::ENCHANTMENT; @@ -267,7 +267,7 @@ void Worldstate::sendPotionRecord(const ESM::Potion* potion) { potionRecords.clear(); - LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Sending ID_RECORD_DYNAMIC with potion %s", potion->mName.c_str()); + LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_RECORD_DYNAMIC with potion %s", potion->mName.c_str()); recordsType = mwmp::RECORD_TYPE::POTION; @@ -283,7 +283,7 @@ void Worldstate::sendSpellRecord(const ESM::Spell* spell) { spellRecords.clear(); - LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Sending ID_RECORD_DYNAMIC with spell %s", spell->mName.c_str()); + LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_RECORD_DYNAMIC with spell %s", spell->mName.c_str()); recordsType = mwmp::RECORD_TYPE::SPELL; @@ -299,7 +299,7 @@ void Worldstate::sendArmorRecord(const ESM::Armor* armor, std::string baseId) { armorRecords.clear(); - LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Sending ID_RECORD_DYNAMIC with armor %s", armor->mName.c_str()); + LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_RECORD_DYNAMIC with armor %s", armor->mName.c_str()); recordsType = mwmp::RECORD_TYPE::ARMOR; @@ -319,7 +319,7 @@ void Worldstate::sendBookRecord(const ESM::Book* book, std::string baseId) { bookRecords.clear(); - LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Sending ID_RECORD_DYNAMIC with book %s", book->mName.c_str()); + LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_RECORD_DYNAMIC with book %s", book->mName.c_str()); recordsType = mwmp::RECORD_TYPE::BOOK; @@ -339,7 +339,7 @@ void Worldstate::sendClothingRecord(const ESM::Clothing* clothing, std::string b { clothingRecords.clear(); - LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Sending ID_RECORD_DYNAMIC with clothing %s", clothing->mName.c_str()); + LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_RECORD_DYNAMIC with clothing %s", clothing->mName.c_str()); recordsType = mwmp::RECORD_TYPE::CLOTHING; @@ -359,7 +359,7 @@ void Worldstate::sendWeaponRecord(const ESM::Weapon* weapon, std::string baseId) { weaponRecords.clear(); - LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Sending ID_RECORD_DYNAMIC with weapon %s", weapon->mName.c_str()); + LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_RECORD_DYNAMIC with weapon %s", weapon->mName.c_str()); recordsType = mwmp::RECORD_TYPE::WEAPON;