pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 05:21:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename OP_BuffFadeMsg to OP_ColoredText since it is a generic opcode

Browse Source
This commit is contained in:
Michael Cook (mackal) 2014-09-24 12:22:06 -04:00
parent 0d12715d77
commit a445d7e39f
20 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/emu_oplist.h
View File

@ -139,7 +139,7 @@ N(OP_Camp),
N(OP_YellForHelp), N(OP_YellForHelp),
N(OP_SafePoint), N(OP_SafePoint),
N(OP_Buff), N(OP_Buff),
N(OP_BuffFadeMsg), N(OP_ColoredText),
N(OP_SpecialMesg), N(OP_SpecialMesg),
N(OP_Consent), N(OP_Consent),
N(OP_ConsentResponse), N(OP_ConsentResponse),

2
common/eq_packet_structs.h
View File

@ -4067,7 +4067,7 @@ struct GroupInvite_Struct {
// uint8 unknown128[65]; // uint8 unknown128[65];
}; };
struct BuffFadeMsg_Struct { struct ColoredText_Struct {
uint32 color; uint32 color;
char msg[1]; char msg[1];
}; };

2
common/opcode_dispatch.h
View File

@ -305,7 +305,7 @@ OUTz(OP_FinishWindow2);
//OUTv(OP_AdventureInfo, strlen(p)+1); //OUTv(OP_AdventureInfo, strlen(p)+1);
//OUTv(OP_AdventureMerchantResponse, strlen(msg)+2); //OUTv(OP_AdventureMerchantResponse, strlen(msg)+2);
OUTv(OP_ItemPacket, ItemPacket_Struct); OUTv(OP_ItemPacket, ItemPacket_Struct);
OUTv(OP_BuffFadeMsg, BuffFadeMsg_Struct); OUTv(OP_ColoredText, ColoredText_Struct);
OUTv(OP_FormattedMessage, FormattedMessage_Struct); OUTv(OP_FormattedMessage, FormattedMessage_Struct);
OUTv(OP_GuildMemberList, uint32); //variable length, but nasty OUTv(OP_GuildMemberList, uint32); //variable length, but nasty
OUTv(OP_InterruptCast, InterruptCast_Struct); OUTv(OP_InterruptCast, InterruptCast_Struct);

2
common/opcode_map.cpp
View File

@ -160,7 +160,7 @@ void load_opcode_names()
opcode_map[0x0192]="LiveOP_YellForHelp"; opcode_map[0x0192]="LiveOP_YellForHelp";
opcode_map[0x00ef]="LiveOP_SafePoint"; opcode_map[0x00ef]="LiveOP_SafePoint";
opcode_map[0x0157]="LiveOP_Buff"; opcode_map[0x0157]="LiveOP_Buff";
opcode_map[0x00c0]="LiveOP_BuffFadeMsg"; opcode_map[0x00c0]="LiveOP_ColoredText";
opcode_map[0x0440]="LiveOP_MultiLineMsg"; opcode_map[0x0440]="LiveOP_MultiLineMsg";
opcode_map[0x021c]="LiveOP_SpecialMesg"; opcode_map[0x021c]="LiveOP_SpecialMesg";
opcode_map[0x0013]="LiveOP_Consent"; opcode_map[0x0013]="LiveOP_Consent";

2
common/patches/client62_structs.h
View File

@ -2969,7 +2969,7 @@ struct GroupInvite_Struct {
// uint8 unknown128[65]; // uint8 unknown128[65];
}; };
struct BuffFadeMsg_Struct { struct ColoredText_Struct {
uint32 color; uint32 color;
char msg[1]; char msg[1];
}; };

2
common/patches/rof_structs.h
View File

@ -4106,7 +4106,7 @@ struct GMToggle_Struct {
uint32 toggle; uint32 toggle;
}; };
struct BuffFadeMsg_Struct { struct ColoredText_Struct {
uint32 color; uint32 color;
char msg[1]; //was 1 char msg[1]; //was 1
/*0???*/ uint8 paddingXXX[3]; // always 0's /*0???*/ uint8 paddingXXX[3]; // always 0's

2
common/patches/sod_structs.h
View File

@ -3693,7 +3693,7 @@ struct GMToggle_Struct {
uint32 toggle; uint32 toggle;
}; };
struct BuffFadeMsg_Struct { struct ColoredText_Struct {
uint32 color; uint32 color;
char msg[1]; //was 1 char msg[1]; //was 1
/*0???*/ uint8 paddingXXX[3]; // always 0's /*0???*/ uint8 paddingXXX[3]; // always 0's

2
common/patches/sof_opcode_list.h
View File

@ -187,7 +187,7 @@
0x1ee9, 0x1ee9,
0x7f5d, OP_CastSpell 0x7f5d, OP_CastSpell
0x0659, OP_ManaChange 0x0659, OP_ManaChange
0x3bc7, OP_BuffFadeMsg 0x3bc7, OP_ColoredText
0x3209, 0x3209,
0x6a93, OP_MemorizeSpell 0x6a93, OP_MemorizeSpell
0x1237, 0x1237,

2
common/patches/sof_structs.h
View File

@ -3556,7 +3556,7 @@ struct GMToggle_Struct {
uint32 toggle; uint32 toggle;
}; };
struct BuffFadeMsg_Struct { struct ColoredText_Struct {
uint32 color; uint32 color;
char msg[1]; //was 1 char msg[1]; //was 1
/*0???*/ uint8 paddingXXX[3]; // always 0's /*0???*/ uint8 paddingXXX[3]; // always 0's

2
common/patches/titanium_structs.h
View File

@ -3046,7 +3046,7 @@ struct GroupInvite_Struct {
// uint8 unknown128[65]; // uint8 unknown128[65];
}; };
struct BuffFadeMsg_Struct { struct ColoredText_Struct {
uint32 color; uint32 color;
char msg[1]; char msg[1];
}; };

2
common/patches/underfoot_structs.h
View File

@ -3735,7 +3735,7 @@ struct GMToggle_Struct {
uint32 toggle; uint32 toggle;
}; };
struct BuffFadeMsg_Struct { struct ColoredText_Struct {
uint32 color; uint32 color;
char msg[1]; //was 1 char msg[1]; //was 1
/*0???*/ uint8 paddingXXX[3]; // always 0's /*0???*/ uint8 paddingXXX[3]; // always 0's

2
utils/patches/opcodes.conf
View File

@ -147,7 +147,7 @@ OP_Begging=0x13e7 # ShowEQ 10/27/05
OP_InspectRequest=0x775d # ShowEQ 10/27/05 OP_InspectRequest=0x775d # ShowEQ 10/27/05
OP_Action2=0x0000 OP_Action2=0x0000
OP_BeginCast=0x3990 # ShowEQ 10/27/05 OP_BeginCast=0x3990 # ShowEQ 10/27/05
OP_BuffFadeMsg=0x0b2d # ShowEQ 10/27/05 OP_ColoredText=0x0b2d # ShowEQ 10/27/05
OP_Consent=0x1081 # ShowEQ 10/27/05 OP_Consent=0x1081 # ShowEQ 10/27/05
OP_LFGCommand=0x68ac # ShowEQ 10/27/05 OP_LFGCommand=0x68ac # ShowEQ 10/27/05
OP_LFGGetMatchesRequest=0x022f # ShowEQ 10/27/05 OP_LFGGetMatchesRequest=0x022f # ShowEQ 10/27/05

2
utils/patches/patch_6.2.conf
View File

@ -150,7 +150,7 @@ OP_InspectRequest=0x2403
OP_Action2=0x0000 # ShowEQ 06/29/05 OP_Action2=0x0000 # ShowEQ 06/29/05
OP_BeginCast=0x3990 # ShowEQ 06/29/05 OP_BeginCast=0x3990 # ShowEQ 06/29/05
OP_WhoAllRequest=0x5cdd # ShowEQ 06/29/05 OP_WhoAllRequest=0x5cdd # ShowEQ 06/29/05
OP_BuffFadeMsg=0x4bc6 # ShowEQ 06/29/05 OP_ColoredText=0x4bc6 # ShowEQ 06/29/05
OP_Consent=0x1081 # ShowEQ 06/29/05 OP_Consent=0x1081 # ShowEQ 06/29/05
OP_LFGCommand=0x022f # ShowEQ 06/29/05 OP_LFGCommand=0x022f # ShowEQ 06/29/05
OP_LFGGetMatchesRequest=0x6f82 # ShowEQ 06/29/05 OP_LFGGetMatchesRequest=0x6f82 # ShowEQ 06/29/05

2
utils/patches/patch_RoF.conf
View File

@ -166,7 +166,7 @@ OP_InspectRequest=0x23f1
OP_InspectAnswer=0x5794 OP_InspectAnswer=0x5794
OP_InspectMessageUpdate=0x3064 OP_InspectMessageUpdate=0x3064
OP_BeginCast=0x17ff OP_BeginCast=0x17ff
OP_BuffFadeMsg=0x41cb OP_ColoredText=0x41cb
OP_ConsentResponse=0x183d OP_ConsentResponse=0x183d
OP_MemorizeSpell=0x2fac OP_MemorizeSpell=0x2fac
OP_SwapSpell=0x4736 OP_SwapSpell=0x4736

4
utils/patches/patch_SoD.conf
View File

@ -168,7 +168,7 @@ OP_GMLastName=0x3563 # C
OP_InspectAnswer=0x4938 # C OP_InspectAnswer=0x4938 # C
OP_Action2=0x7e4d # C OP_Damage? OP_Action2=0x7e4d # C OP_Damage?
OP_BeginCast=0x0d5a # C OP_BeginCast=0x0d5a # C
OP_BuffFadeMsg=0x569a # C OP_ColoredText=0x569a # C
OP_ConsentResponse=0x6e47 # C OP_ConsentResponse=0x6e47 # C
OP_MemorizeSpell=0x8543 # C OP_MemorizeSpell=0x8543 # C
OP_SwapSpell=0x3fd2 # C OP_SwapSpell=0x3fd2 # C
@ -659,4 +659,4 @@ OP_RAWOutOfSession=0x0000 #
# we need to document the differences between these packets to make identifying them easier # we need to document the differences between these packets to make identifying them easier
OP_Some3ByteHPUpdate=0x0000 # initial HP update for mobs OP_Some3ByteHPUpdate=0x0000 # initial HP update for mobs
OP_InitialHPUpdate=0x0000 # OP_InitialHPUpdate=0x0000 #

2
utils/patches/patch_SoF.conf
View File

@ -164,7 +164,7 @@ OP_GMLastName=0x0375 #/lastname <Name> <New Surname>
OP_InspectAnswer=0x084F #SEQ 12/04/08 OP_InspectAnswer=0x084F #SEQ 12/04/08
OP_Action2=0x0EF2 #SEQ 12/04/08 OP_Action2=0x0EF2 #SEQ 12/04/08
OP_BeginCast=0x5A50 #SEQ 12/04/08 OP_BeginCast=0x5A50 #SEQ 12/04/08
OP_BuffFadeMsg=0x3BC7 #SEQ 12/04/08 OP_ColoredText=0x3BC7 #SEQ 12/04/08
OP_ConsentResponse=0x4D30 #SEQ 12/04/08 OP_ConsentResponse=0x4D30 #SEQ 12/04/08
OP_MemorizeSpell=0x6A93 #SEQ 12/04/08 OP_MemorizeSpell=0x6A93 #SEQ 12/04/08
OP_SwapSpell=0x1418 #SEQ 12/04/08 OP_SwapSpell=0x1418 #SEQ 12/04/08

2
utils/patches/patch_Titanium.conf
View File

@ -154,7 +154,7 @@ OP_InspectRequest=0x775d # ShowEQ 10/27/05
OP_InspectAnswer=0x2403 # ShowEQ 10/27/05 OP_InspectAnswer=0x2403 # ShowEQ 10/27/05
OP_Action2=0x0000 OP_Action2=0x0000
OP_BeginCast=0x3990 # ShowEQ 10/27/05 OP_BeginCast=0x3990 # ShowEQ 10/27/05
OP_BuffFadeMsg=0x0b2d # ShowEQ 10/27/05 OP_ColoredText=0x0b2d # ShowEQ 10/27/05
OP_Consent=0x1081 # ShowEQ 10/27/05 OP_Consent=0x1081 # ShowEQ 10/27/05
OP_ConsentDeny=0x4e8c # ShowEQ 10/27/05 OP_ConsentDeny=0x4e8c # ShowEQ 10/27/05
OP_ConsentResponse=0x6380 # ShowEQ 10/27/05 OP_ConsentResponse=0x6380 # ShowEQ 10/27/05

2
utils/patches/patch_Underfoot.conf
View File

@ -168,7 +168,7 @@ OP_GMLastName=0x7bfb # C
OP_InspectAnswer=0x0c2b # C OP_InspectAnswer=0x0c2b # C
OP_BeginCast=0x0d5a # C OP_BeginCast=0x0d5a # C
OP_BuffFadeMsg=0x71bf # C OP_ColoredText=0x71bf # C
OP_ConsentResponse=0x0e87 # C OP_ConsentResponse=0x0e87 # C
OP_MemorizeSpell=0x3887 # C OP_MemorizeSpell=0x3887 # C
OP_SwapSpell=0x5805 # C OP_SwapSpell=0x5805 # C

2
zone/lua_packet.cpp
View File

@ -446,7 +446,7 @@ luabind::scope lua_register_packet_opcodes() {
luabind::value("YellForHelp", static_cast<int>(OP_YellForHelp)), luabind::value("YellForHelp", static_cast<int>(OP_YellForHelp)),
luabind::value("SafePoint", static_cast<int>(OP_SafePoint)), luabind::value("SafePoint", static_cast<int>(OP_SafePoint)),
luabind::value("Buff", static_cast<int>(OP_Buff)), luabind::value("Buff", static_cast<int>(OP_Buff)),
luabind::value("BuffFadeMsg", static_cast<int>(OP_BuffFadeMsg)), luabind::value("ColoredText", static_cast<int>(OP_ColoredText)),
luabind::value("SpecialMesg", static_cast<int>(OP_SpecialMesg)), luabind::value("SpecialMesg", static_cast<int>(OP_SpecialMesg)),
luabind::value("Consent", static_cast<int>(OP_Consent)), luabind::value("Consent", static_cast<int>(OP_Consent)),
luabind::value("ConsentResponse", static_cast<int>(OP_ConsentResponse)), luabind::value("ConsentResponse", static_cast<int>(OP_ConsentResponse)),

4
zone/spells.cpp
View File

@ -4817,8 +4817,8 @@ void Client::MakeBuffFadePacket(uint16 spell_id, int slot_id, bool send_message)
if(send_message) if(send_message)
{ {
const char *fadetext = spells[spell_id].spell_fades; const char *fadetext = spells[spell_id].spell_fades;
outapp = new EQApplicationPacket(OP_BuffFadeMsg, sizeof(BuffFadeMsg_Struct) + strlen(fadetext)); outapp = new EQApplicationPacket(OP_ColoredText, sizeof(ColoredText_Struct) + strlen(fadetext));
BuffFadeMsg_Struct *bfm = (BuffFadeMsg_Struct *) outapp->pBuffer; ColoredText_Struct *bfm = (ColoredText_Struct *) outapp->pBuffer;
bfm->color = MT_Spells; bfm->color = MT_Spells;
memcpy(bfm->msg, fadetext, strlen(fadetext)); memcpy(bfm->msg, fadetext, strlen(fadetext));
QueuePacket(outapp); QueuePacket(outapp);