pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-05 17:42:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change faction messages to use String IDs.

Browse Source
This commit is contained in:
Michael Cook (mackal) 2014-01-11 13:20:01 -05:00
parent fdced53be1
commit 821ba8b701
2 changed files with 20 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
zone/client.cpp
View File

@ -7516,10 +7516,7 @@ void Client::SetFactionLevel(uint32 char_id, uint32 npc_id, uint8 char_class, ui
if(tmpValue <= MIN_FACTION) if(tmpValue <= MIN_FACTION)
tmpValue = MIN_FACTION; tmpValue = MIN_FACTION;
char* msg = BuildFactionMessage(npc_value[i],faction_id[i],tmpValue,temp[i]); SendFactionMessage(npc_value[i], faction_id[i], tmpValue, temp[i]);
if (msg != 0)
Message(0, msg);
safe_delete_array(msg);
} }
} }
} }
@ -7536,11 +7533,7 @@ void Client::SetFactionLevel2(uint32 char_id, int32 faction_id, uint8 char_class
if(!(database.SetCharacterFactionLevel(char_id, faction_id, current_value, temp, factionvalues))) if(!(database.SetCharacterFactionLevel(char_id, faction_id, current_value, temp, factionvalues)))
return; return;
char* msg = BuildFactionMessage(value, faction_id, current_value, temp); SendFactionMessage(value, faction_id, current_value, temp);
if (msg != 0)
Message(0, msg);
safe_delete(msg);
} }
return; return;
} }
@ -7594,52 +7587,30 @@ bool Client::HatedByClass(uint32 p_race, uint32 p_class, uint32 p_deity, int32 p
} }
//o-------------------------------------------------------------- //o--------------------------------------------------------------
//| Name: BuildFactionMessage; rembrant, Dec. 16, 2001 //| Name: SendFactionMessage
//o-------------------------------------------------------------- //o--------------------------------------------------------------
//| Purpose: duh? //| Purpose: Send faction change message to client
//o-------------------------------------------------------------- //o--------------------------------------------------------------
char* Client::BuildFactionMessage(int32 tmpvalue, int32 faction_id, int32 totalvalue, uint8 temp) void Client::SendFactionMessage(int32 tmpvalue, int32 faction_id, int32 totalvalue, uint8 temp)
{ {
/*
This should be replaced to send string-ID based messages using:
#define FACTION_WORST 469 //Your faction standing with %1 could not possibly get any worse.
#define FACTION_WORSE 470 //Your faction standing with %1 got worse.
#define FACTION_BEST 471 //Your faction standing with %1 could not possibly get any better.
#define FACTION_BETTER 472 //Your faction standing with %1 got better.
some day.
*/
//tmpvalue is the change as best I can tell.
char *faction_message = 0;
char name[50]; char name[50];
if(database.GetFactionName(faction_id, name, sizeof(name)) == false) { // default to Faction# if we couldn't get the name from the ID
if (database.GetFactionName(faction_id, name, sizeof(name)) == false)
snprintf(name, sizeof(name),"Faction%i",faction_id); snprintf(name, sizeof(name),"Faction%i",faction_id);
}
if(tmpvalue == 0 || temp == 1 || temp == 2) { if (tmpvalue == 0 || temp == 1 || temp == 2)
return 0; return;
} else if (totalvalue >= MAX_FACTION)
else if (totalvalue >= MAX_FACTION) { Message_StringID(0, FACTION_BEST, name);
MakeAnyLenString(&faction_message, "Your faction standing with %s could not possibly get any better!", name); else if (tmpvalue > 0 && totalvalue < MAX_FACTION)
return faction_message; Message_StringID(0, FACTION_BETTER, name);
} else if (tmpvalue < 0 && totalvalue > MIN_FACTION)
else if(tmpvalue > 0 && totalvalue < MAX_FACTION) { Message_StringID(0, FACTION_WORSE, name);
MakeAnyLenString(&faction_message, "Your faction standing with %s has gotten better!", name); else if (totalvalue <= MIN_FACTION)
return faction_message; Message_StringID(0, FACTION_WORST, name);
}
else if(tmpvalue < 0 && totalvalue > MIN_FACTION) { return;
MakeAnyLenString(&faction_message, "Your faction standing with %s has gotten worse!", name);
return faction_message;
}
else if(totalvalue <= MIN_FACTION) {
MakeAnyLenString(&faction_message, "Your faction standing with %s could not possibly get any worse!", name);
return faction_message;
}
return 0;
} }
void Client::LoadAccountFlags() void Client::LoadAccountFlags()

2
zone/client.h
View File

@ -587,7 +587,7 @@ public:
int32 GetCharacterFactionLevel(int32 faction_id); int32 GetCharacterFactionLevel(int32 faction_id);
int32 GetModCharacterFactionLevel(int32 faction_id); int32 GetModCharacterFactionLevel(int32 faction_id);
bool HatedByClass(uint32 p_race, uint32 p_class, uint32 p_deity, int32 pFaction); bool HatedByClass(uint32 p_race, uint32 p_class, uint32 p_deity, int32 pFaction);
char* BuildFactionMessage(int32 tmpvalue, int32 faction_id, int32 totalvalue, uint8 temp); void SendFactionMessage(int32 tmpvalue, int32 faction_id, int32 totalvalue, uint8 temp);
void SetFactionLevel(uint32 char_id, uint32 npc_id, uint8 char_class, uint8 char_race, uint8 char_deity); void SetFactionLevel(uint32 char_id, uint32 npc_id, uint8 char_class, uint8 char_race, uint8 char_deity);
void SetFactionLevel2(uint32 char_id, int32 faction_id, uint8 char_class, uint8 char_race, uint8 char_deity, int32 value, uint8 temp); void SetFactionLevel2(uint32 char_id, int32 faction_id, uint8 char_class, uint8 char_race, uint8 char_deity, int32 value, uint8 temp);