diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/DataStores/DBCStores.cpp | 6 | ||||
| -rwxr-xr-x | src/server/game/Entities/Vehicle/Vehicle.cpp | 5 | ||||
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Tools/PlayerDump.cpp | 9 |
4 files changed, 16 insertions, 7 deletions
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 34df901175a..d2bc89c53cd 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -439,7 +439,8 @@ void LoadDBCStores(const std::string& dataPath) { ASSERT(namesProfanity->Language < TOTAL_LOCALES || namesProfanity->Language == -1); std::wstring wname; - ASSERT(Utf8toWStr(namesProfanity->Name, wname)); + bool conversionResult = Utf8toWStr(namesProfanity->Name, wname); + ASSERT(conversionResult); if (namesProfanity->Language != -1) NamesProfaneValidators[namesProfanity->Language].emplace_back(wname, Trinity::regex::perl | Trinity::regex::icase | Trinity::regex::optimize); @@ -452,7 +453,8 @@ void LoadDBCStores(const std::string& dataPath) { ASSERT(namesReserved->Language < TOTAL_LOCALES || namesReserved->Language == -1); std::wstring wname; - ASSERT(Utf8toWStr(namesReserved->Name, wname)); + bool conversionResult = Utf8toWStr(namesReserved->Name, wname); + ASSERT(conversionResult); if (namesReserved->Language != -1) NamesReservedValidators[namesReserved->Language].emplace_back(wname, Trinity::regex::perl | Trinity::regex::icase | Trinity::regex::optimize); diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 79ab1642853..9b06cbdd0d4 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -826,7 +826,10 @@ bool VehicleJoinEvent::Execute(uint64, uint32) if (Target->GetBase()->GetTypeId() == TYPEID_UNIT && Passenger->GetTypeId() == TYPEID_PLAYER && Seat->second.SeatInfo->m_flags & VEHICLE_SEAT_FLAG_CAN_CONTROL) - ASSERT(Target->GetBase()->SetCharmedBy(Passenger, CHARM_TYPE_VEHICLE)); // SMSG_CLIENT_CONTROL + { + bool charmedByResult = Target->GetBase()->SetCharmedBy(Passenger, CHARM_TYPE_VEHICLE); // SMSG_CLIENT_CONTROL + ASSERT(charmedByResult); + } Passenger->SendClearTarget(); // SMSG_BREAK_TARGET Passenger->SetControlled(true, UNIT_STATE_ROOT); // SMSG_FORCE_ROOT - In some cases we send SMSG_SPLINE_MOVE_ROOT here (for creatures) diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 370b6b65872..ef67bb36398 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -161,7 +161,8 @@ bool Group::Create(Player* leader) Group::ConvertLeaderInstancesToGroup(leader, this, false); - ASSERT(AddMember(leader)); // If the leader can't be added to a new group because it appears full, something is clearly wrong. + bool addMemberResult = AddMember(leader); + ASSERT(addMemberResult); // If the leader can't be added to a new group because it appears full, something is clearly wrong. } else if (!AddMember(leader)) return false; diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index 1c11121b94a..414eaf22d07 100644 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -168,10 +168,12 @@ std::vector<TableStruct> CharacterTables; inline bool StringsEqualCaseInsensitive(std::string const& left, std::string const& right) { std::string upperLeftString = left; - ASSERT(Utf8ToUpperOnlyLatin(upperLeftString)); + bool leftResult = Utf8ToUpperOnlyLatin(upperLeftString); + ASSERT(leftResult); std::string upperRightString = right; - ASSERT(Utf8ToUpperOnlyLatin(upperRightString)); + bool rightResult = Utf8ToUpperOnlyLatin(upperRightString); + ASSERT(rightResult); return upperLeftString == upperRightString; } @@ -270,7 +272,8 @@ void PlayerDump::InitializeTables() TableField f; f.FieldName = columnName; - ASSERT(Utf8ToUpperOnlyLatin(columnName)); + bool toUpperResult = Utf8ToUpperOnlyLatin(columnName); + ASSERT(toUpperResult); t.TableFields.emplace_back(std::move(f)); } while (result->NextRow()); |