From 450c7482996372b86f034c55aa598248d6df4020 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sun, 28 Feb 2021 19:31:46 -0600 Subject: [PATCH] Fix database connection pointer bucket consistency --- world/client.cpp | 2 +- world/zoneserver.cpp | 2 +- zone/bot.cpp | 4 ++-- zone/client.cpp | 6 +++--- zone/command.cpp | 2 +- zone/main.cpp | 2 +- zone/merc.cpp | 6 +++--- zone/npc.cpp | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/world/client.cpp b/world/client.cpp index 811d53b31..1ff2403a9 100644 --- a/world/client.cpp +++ b/world/client.cpp @@ -1906,7 +1906,7 @@ void Client::SetClassStartingSkills(PlayerProfile_Struct *pp) i == EQ::skills::SkillAlcoholTolerance || i == EQ::skills::SkillBindWound) continue; - pp->skills[i] = database.GetSkillCap(pp->class_, (EQ::skills::SkillType)i, 1); + pp->skills[i] = content_db.GetSkillCap(pp->class_, (EQ::skills::SkillType)i, 1); } } diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp index e08ec8460..008c98073 100644 --- a/world/zoneserver.cpp +++ b/world/zoneserver.cpp @@ -1338,7 +1338,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) { } LogInfo("Loading skill caps"); - if (!database.LoadSkillCaps(hotfix_name)) { + if (!content_db.LoadSkillCaps(hotfix_name)) { LogInfo("Error: Could not load skill cap data. But ignoring"); } diff --git a/zone/bot.cpp b/zone/bot.cpp index 17278dad0..59bdf9788 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -1591,7 +1591,7 @@ uint16 Bot::GetPrimarySkillValue() { } uint16 Bot::MaxSkill(EQ::skills::SkillType skillid, uint16 class_, uint16 level) const { - return(database.GetSkillCap(class_, skillid, level)); + return(content_db.GetSkillCap(class_, skillid, level)); } uint32 Bot::GetTotalATK() { @@ -9082,7 +9082,7 @@ void Bot::CalcBotStats(bool showtext) { SetLevel(GetBotOwner()->GetLevel()); for (int sindex = 0; sindex <= EQ::skills::HIGHEST_SKILL; ++sindex) { - skills[sindex] = database.GetSkillCap(GetClass(), (EQ::skills::SkillType)sindex, GetLevel()); + skills[sindex] = content_db.GetSkillCap(GetClass(), (EQ::skills::SkillType)sindex, GetLevel()); } taunt_timer.Start(1000); diff --git a/zone/client.cpp b/zone/client.cpp index 1a9247259..104dce3bc 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -2505,7 +2505,7 @@ bool Client::CanHaveSkill(EQ::skills::SkillType skill_id) const { if (ClientVersion() < EQ::versions::ClientVersion::RoF2 && class_ == BERSERKER && skill_id == EQ::skills::Skill1HPiercing) skill_id = EQ::skills::Skill2HPiercing; - return(database.GetSkillCap(GetClass(), skill_id, RuleI(Character, MaxLevel)) > 0); + return(content_db.GetSkillCap(GetClass(), skill_id, RuleI(Character, MaxLevel)) > 0); //if you don't have it by max level, then odds are you never will? } @@ -2513,7 +2513,7 @@ uint16 Client::MaxSkill(EQ::skills::SkillType skillid, uint16 class_, uint16 lev if (ClientVersion() < EQ::versions::ClientVersion::RoF2 && class_ == BERSERKER && skillid == EQ::skills::Skill1HPiercing) skillid = EQ::skills::Skill2HPiercing; - return(database.GetSkillCap(class_, skillid, level)); + return(content_db.GetSkillCap(class_, skillid, level)); } uint8 Client::SkillTrainLevel(EQ::skills::SkillType skillid, uint16 class_) @@ -2521,7 +2521,7 @@ uint8 Client::SkillTrainLevel(EQ::skills::SkillType skillid, uint16 class_) if (ClientVersion() < EQ::versions::ClientVersion::RoF2 && class_ == BERSERKER && skillid == EQ::skills::Skill1HPiercing) skillid = EQ::skills::Skill2HPiercing; - return(database.GetTrainLevel(class_, skillid, RuleI(Character, MaxLevel))); + return(content_db.GetTrainLevel(class_, skillid, RuleI(Character, MaxLevel))); } uint16 Client::GetMaxSkillAfterSpecializationRules(EQ::skills::SkillType skillid, uint16 maxSkill) diff --git a/zone/command.cpp b/zone/command.cpp index b88f1e102..0f6ee0702 100755 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -12552,7 +12552,7 @@ void command_max_all_skills(Client *c, const Seperator *sep) } else { - int max_skill_level = database.GetSkillCap(c->GetClass(), (EQ::skills::SkillType)i, c->GetLevel()); + int max_skill_level = content_db.GetSkillCap(c->GetClass(), (EQ::skills::SkillType)i, c->GetLevel()); c->SetSkill((EQ::skills::SkillType)i, max_skill_level); } } diff --git a/zone/main.cpp b/zone/main.cpp index c30c9322e..dc708a517 100644 --- a/zone/main.cpp +++ b/zone/main.cpp @@ -318,7 +318,7 @@ int main(int argc, char** argv) { return 1; } LogInfo("Loading skill caps"); - if (!database.LoadSkillCaps(std::string(hotfix_name))) { + if (!content_db.LoadSkillCaps(std::string(hotfix_name))) { LogError("Loading skill caps failed!"); return 1; } diff --git a/zone/merc.cpp b/zone/merc.cpp index bb5cf3871..71f6dc673 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -74,7 +74,7 @@ Merc::Merc(const NPCType* d, float x, float y, float z, float heading) int r; for (r = 0; r <= EQ::skills::HIGHEST_SKILL; r++) { - skills[r] = database.GetSkillCap(GetClass(), (EQ::skills::SkillType)r, GetLevel()); + skills[r] = content_db.GetSkillCap(GetClass(), (EQ::skills::SkillType)r, GetLevel()); } size = d->size; @@ -1180,12 +1180,12 @@ bool Merc::HasSkill(EQ::skills::SkillType skill_id) const { } bool Merc::CanHaveSkill(EQ::skills::SkillType skill_id) const { - return(database.GetSkillCap(GetClass(), skill_id, RuleI(Character, MaxLevel)) > 0); + return(content_db.GetSkillCap(GetClass(), skill_id, RuleI(Character, MaxLevel)) > 0); //if you don't have it by max level, then odds are you never will? } uint16 Merc::MaxSkill(EQ::skills::SkillType skillid, uint16 class_, uint16 level) const { - return(database.GetSkillCap(class_, skillid, level)); + return(content_db.GetSkillCap(class_, skillid, level)); } void Merc::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) { diff --git a/zone/npc.cpp b/zone/npc.cpp index ff46c1331..57bbb4ae2 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -309,7 +309,7 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi //give NPCs skill values... int r; for (r = 0; r <= EQ::skills::HIGHEST_SKILL; r++) { - skills[r] = database.GetSkillCap(GetClass(), (EQ::skills::SkillType)r, moblevel); + skills[r] = content_db.GetSkillCap(GetClass(), (EQ::skills::SkillType)r, moblevel); } // some overrides -- really we need to be able to set skills for mobs in the DB // There are some known low level SHM/BST pets that do not follow this, which supports @@ -3322,7 +3322,7 @@ void NPC::RecalculateSkills() { int r; for (r = 0; r <= EQ::skills::HIGHEST_SKILL; r++) { - skills[r] = database.GetSkillCap(GetClass(), (EQ::skills::SkillType)r, level); + skills[r] = content_db.GetSkillCap(GetClass(), (EQ::skills::SkillType)r, level); } // some overrides -- really we need to be able to set skills for mobs in the DB