pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Consistency] Deity not diety. (#1407)

Browse Source 
* [Consistency] Deity not diety.

* Uppercase. [skip ci]
This commit is contained in:
Alex
2021-06-16 10:33:10 -04:00
committed by GitHub
parent f2ffca1a06
commit ecdebbc1a7
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/embparser_api.cpp
+2 -2
View File
@@ -805,9 +805,9 @@ XS(XS__changedeity) {
if (items != 1)
Perl_croak(aTHX_ "Usage: quest::changedeity(int deity_id)");
int diety_id = (int) SvIV(ST(0));
int deity_id = (int) SvIV(ST(0));
quest_manager.changedeity(diety_id);
quest_manager.changedeity(deity_id);
XSRETURN_EMPTY;
}
zone/mob.cpp
+1 -1
View File
@@ -5557,7 +5557,7 @@ int32 Mob::GetSpellStat(uint32 spell_id, const char *identifier, uint8 slot)
if (slot < 16){
if (id == "classes") {return spells[spell_id].classes[slot]; }
else if (id == "dieties") {return spells[spell_id].deities[slot];}
else if (id == "deities") {return spells[spell_id].deities[slot];}
}
if (slot < 12){
zone/questmgr.cpp
+3 -3
View File
@@ -897,15 +897,15 @@ void QuestManager::sfollow() {
owner->SetFollowID(0);
}
void QuestManager::changedeity(int diety_id) {
void QuestManager::changedeity(int deity_id) {
QuestManagerCurrentQuestVars();
//Changes the deity.
if(initiator)
{
if(initiator->IsClient())
{
initiator->SetDeity(diety_id);
initiator->Message(Chat::Yellow,"Your Deity has been changed/set to: %i", diety_id);
initiator->SetDeity(deity_id);
initiator->Message(Chat::Yellow,"Your Deity has been changed/set to: %i", deity_id);
initiator->Save(1);
initiator->Kick("Deity change by QuestManager");
}
zone/questmgr.h
+1 -1
View File
@@ -106,7 +106,7 @@ public:
void settarget(const char *type, int target_id);
void follow(int entity_id, int distance);
void sfollow();
void changedeity(int diety_id);
void changedeity(int deity_id);
void exp(int amt);
void level(int newlevel);
void traindisc(int discipline_tome_item_id);
zone/zonedb.cpp
+3 -3
View File
@@ -3930,8 +3930,8 @@ bool ZoneDatabase::GetFactionData(FactionMods* fm, uint32 class_mod, uint32 race
}
fm->base = faction_array[faction_id]->base;
fm->min = faction_array[faction_id]->min; // The lowest your personal earned faction can go - before race/class/diety adjustments.
fm->max = faction_array[faction_id]->max; // The highest your personal earned faction can go - before race/class/diety adjustments.
fm->min = faction_array[faction_id]->min; // The lowest your personal earned faction can go - before race/class/deity adjustments.
fm->max = faction_array[faction_id]->max; // The highest your personal earned faction can go - before race/class/deity adjustments.
if(class_mod > 0) {
char str[32];
@@ -4131,7 +4131,7 @@ bool ZoneDatabase::LoadFactionData()
LogInfo("Unable to load Faction Base data...");
}
// load race, class and diety modifiers
// load race, class and deity modifiers
query = fmt::format("SELECT `faction_id`, `mod`, `mod_name` FROM `faction_list_mod` WHERE `faction_id` IN ({})", faction_id_criteria);
auto modifier_results = QueryDatabase(query);