diff --git a/common/emu_oplist.h b/common/emu_oplist.h index c1ceb3c80..4eb516d94 100644 --- a/common/emu_oplist.h +++ b/common/emu_oplist.h @@ -139,7 +139,7 @@ N(OP_Camp), N(OP_YellForHelp), N(OP_SafePoint), N(OP_Buff), -N(OP_BuffFadeMsg), +N(OP_ColoredText), N(OP_SpecialMesg), N(OP_Consent), N(OP_ConsentResponse), diff --git a/common/eq_packet_structs.h b/common/eq_packet_structs.h index dab4bf0bb..ea0acaa90 100644 --- a/common/eq_packet_structs.h +++ b/common/eq_packet_structs.h @@ -4067,7 +4067,7 @@ struct GroupInvite_Struct { // uint8 unknown128[65]; }; -struct BuffFadeMsg_Struct { +struct ColoredText_Struct { uint32 color; char msg[1]; }; diff --git a/common/opcode_dispatch.h b/common/opcode_dispatch.h index 352fc62ef..3920dd3f7 100644 --- a/common/opcode_dispatch.h +++ b/common/opcode_dispatch.h @@ -305,7 +305,7 @@ OUTz(OP_FinishWindow2); //OUTv(OP_AdventureInfo, strlen(p)+1); //OUTv(OP_AdventureMerchantResponse, strlen(msg)+2); OUTv(OP_ItemPacket, ItemPacket_Struct); -OUTv(OP_BuffFadeMsg, BuffFadeMsg_Struct); +OUTv(OP_ColoredText, ColoredText_Struct); OUTv(OP_FormattedMessage, FormattedMessage_Struct); OUTv(OP_GuildMemberList, uint32); //variable length, but nasty OUTv(OP_InterruptCast, InterruptCast_Struct); diff --git a/common/opcode_map.cpp b/common/opcode_map.cpp index 10babaccb..edb6ba64c 100644 --- a/common/opcode_map.cpp +++ b/common/opcode_map.cpp @@ -160,7 +160,7 @@ void load_opcode_names() opcode_map[0x0192]="LiveOP_YellForHelp"; opcode_map[0x00ef]="LiveOP_SafePoint"; opcode_map[0x0157]="LiveOP_Buff"; - opcode_map[0x00c0]="LiveOP_BuffFadeMsg"; + opcode_map[0x00c0]="LiveOP_ColoredText"; opcode_map[0x0440]="LiveOP_MultiLineMsg"; opcode_map[0x021c]="LiveOP_SpecialMesg"; opcode_map[0x0013]="LiveOP_Consent"; diff --git a/common/patches/client62_structs.h b/common/patches/client62_structs.h index 27b808620..73726e165 100644 --- a/common/patches/client62_structs.h +++ b/common/patches/client62_structs.h @@ -2969,7 +2969,7 @@ struct GroupInvite_Struct { // uint8 unknown128[65]; }; -struct BuffFadeMsg_Struct { +struct ColoredText_Struct { uint32 color; char msg[1]; }; diff --git a/common/patches/rof_structs.h b/common/patches/rof_structs.h index 2d1b5ef18..79b4f21b8 100644 --- a/common/patches/rof_structs.h +++ b/common/patches/rof_structs.h @@ -4106,7 +4106,7 @@ struct GMToggle_Struct { uint32 toggle; }; -struct BuffFadeMsg_Struct { +struct ColoredText_Struct { uint32 color; char msg[1]; //was 1 /*0???*/ uint8 paddingXXX[3]; // always 0's diff --git a/common/patches/sod_structs.h b/common/patches/sod_structs.h index 99a904b86..ffd6e9ecb 100644 --- a/common/patches/sod_structs.h +++ b/common/patches/sod_structs.h @@ -3693,7 +3693,7 @@ struct GMToggle_Struct { uint32 toggle; }; -struct BuffFadeMsg_Struct { +struct ColoredText_Struct { uint32 color; char msg[1]; //was 1 /*0???*/ uint8 paddingXXX[3]; // always 0's diff --git a/common/patches/sof_opcode_list.h b/common/patches/sof_opcode_list.h index 28a1ce650..15236862f 100644 --- a/common/patches/sof_opcode_list.h +++ b/common/patches/sof_opcode_list.h @@ -187,7 +187,7 @@ 0x1ee9, 0x7f5d, OP_CastSpell 0x0659, OP_ManaChange -0x3bc7, OP_BuffFadeMsg +0x3bc7, OP_ColoredText 0x3209, 0x6a93, OP_MemorizeSpell 0x1237, diff --git a/common/patches/sof_structs.h b/common/patches/sof_structs.h index a31d60ef8..7d250a568 100644 --- a/common/patches/sof_structs.h +++ b/common/patches/sof_structs.h @@ -3556,7 +3556,7 @@ struct GMToggle_Struct { uint32 toggle; }; -struct BuffFadeMsg_Struct { +struct ColoredText_Struct { uint32 color; char msg[1]; //was 1 /*0???*/ uint8 paddingXXX[3]; // always 0's diff --git a/common/patches/titanium_structs.h b/common/patches/titanium_structs.h index 1c058fb77..1fcd31b77 100644 --- a/common/patches/titanium_structs.h +++ b/common/patches/titanium_structs.h @@ -3046,7 +3046,7 @@ struct GroupInvite_Struct { // uint8 unknown128[65]; }; -struct BuffFadeMsg_Struct { +struct ColoredText_Struct { uint32 color; char msg[1]; }; diff --git a/common/patches/underfoot_structs.h b/common/patches/underfoot_structs.h index 860fdd34a..8226e8fd7 100644 --- a/common/patches/underfoot_structs.h +++ b/common/patches/underfoot_structs.h @@ -3735,7 +3735,7 @@ struct GMToggle_Struct { uint32 toggle; }; -struct BuffFadeMsg_Struct { +struct ColoredText_Struct { uint32 color; char msg[1]; //was 1 /*0???*/ uint8 paddingXXX[3]; // always 0's diff --git a/utils/patches/opcodes.conf b/utils/patches/opcodes.conf index ed2a685d7..562ba3347 100644 --- a/utils/patches/opcodes.conf +++ b/utils/patches/opcodes.conf @@ -147,7 +147,7 @@ OP_Begging=0x13e7 # ShowEQ 10/27/05 OP_InspectRequest=0x775d # ShowEQ 10/27/05 OP_Action2=0x0000 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_LFGCommand=0x68ac # ShowEQ 10/27/05 OP_LFGGetMatchesRequest=0x022f # ShowEQ 10/27/05 diff --git a/utils/patches/patch_6.2.conf b/utils/patches/patch_6.2.conf index 25944a3b5..8eca3dd4e 100644 --- a/utils/patches/patch_6.2.conf +++ b/utils/patches/patch_6.2.conf @@ -150,7 +150,7 @@ OP_InspectRequest=0x2403 OP_Action2=0x0000 # ShowEQ 06/29/05 OP_BeginCast=0x3990 # 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_LFGCommand=0x022f # ShowEQ 06/29/05 OP_LFGGetMatchesRequest=0x6f82 # ShowEQ 06/29/05 diff --git a/utils/patches/patch_RoF.conf b/utils/patches/patch_RoF.conf index 50bfd5580..728676b2d 100644 --- a/utils/patches/patch_RoF.conf +++ b/utils/patches/patch_RoF.conf @@ -166,7 +166,7 @@ OP_InspectRequest=0x23f1 OP_InspectAnswer=0x5794 OP_InspectMessageUpdate=0x3064 OP_BeginCast=0x17ff -OP_BuffFadeMsg=0x41cb +OP_ColoredText=0x41cb OP_ConsentResponse=0x183d OP_MemorizeSpell=0x2fac OP_SwapSpell=0x4736 diff --git a/utils/patches/patch_SoD.conf b/utils/patches/patch_SoD.conf index 642e0f4ab..10df077f7 100644 --- a/utils/patches/patch_SoD.conf +++ b/utils/patches/patch_SoD.conf @@ -168,7 +168,7 @@ OP_GMLastName=0x3563 # C OP_InspectAnswer=0x4938 # C OP_Action2=0x7e4d # C OP_Damage? OP_BeginCast=0x0d5a # C -OP_BuffFadeMsg=0x569a # C +OP_ColoredText=0x569a # C OP_ConsentResponse=0x6e47 # C OP_MemorizeSpell=0x8543 # 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 OP_Some3ByteHPUpdate=0x0000 # initial HP update for mobs -OP_InitialHPUpdate=0x0000 # \ No newline at end of file +OP_InitialHPUpdate=0x0000 # diff --git a/utils/patches/patch_SoF.conf b/utils/patches/patch_SoF.conf index 819096ed4..5bffdfc93 100644 --- a/utils/patches/patch_SoF.conf +++ b/utils/patches/patch_SoF.conf @@ -164,7 +164,7 @@ OP_GMLastName=0x0375 #/lastname OP_InspectAnswer=0x084F #SEQ 12/04/08 OP_Action2=0x0EF2 #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_MemorizeSpell=0x6A93 #SEQ 12/04/08 OP_SwapSpell=0x1418 #SEQ 12/04/08 diff --git a/utils/patches/patch_Titanium.conf b/utils/patches/patch_Titanium.conf index 93f24e8db..50e426874 100644 --- a/utils/patches/patch_Titanium.conf +++ b/utils/patches/patch_Titanium.conf @@ -154,7 +154,7 @@ OP_InspectRequest=0x775d # ShowEQ 10/27/05 OP_InspectAnswer=0x2403 # ShowEQ 10/27/05 OP_Action2=0x0000 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_ConsentDeny=0x4e8c # ShowEQ 10/27/05 OP_ConsentResponse=0x6380 # ShowEQ 10/27/05 diff --git a/utils/patches/patch_Underfoot.conf b/utils/patches/patch_Underfoot.conf index cce73ce45..4621a74a9 100644 --- a/utils/patches/patch_Underfoot.conf +++ b/utils/patches/patch_Underfoot.conf @@ -168,7 +168,7 @@ OP_GMLastName=0x7bfb # C OP_InspectAnswer=0x0c2b # C OP_BeginCast=0x0d5a # C -OP_BuffFadeMsg=0x71bf # C +OP_ColoredText=0x71bf # C OP_ConsentResponse=0x0e87 # C OP_MemorizeSpell=0x3887 # C OP_SwapSpell=0x5805 # C diff --git a/zone/lua_packet.cpp b/zone/lua_packet.cpp index 640ee7015..deff0f0f2 100644 --- a/zone/lua_packet.cpp +++ b/zone/lua_packet.cpp @@ -446,7 +446,7 @@ luabind::scope lua_register_packet_opcodes() { luabind::value("YellForHelp", static_cast(OP_YellForHelp)), luabind::value("SafePoint", static_cast(OP_SafePoint)), luabind::value("Buff", static_cast(OP_Buff)), - luabind::value("BuffFadeMsg", static_cast(OP_BuffFadeMsg)), + luabind::value("ColoredText", static_cast(OP_ColoredText)), luabind::value("SpecialMesg", static_cast(OP_SpecialMesg)), luabind::value("Consent", static_cast(OP_Consent)), luabind::value("ConsentResponse", static_cast(OP_ConsentResponse)), diff --git a/zone/spells.cpp b/zone/spells.cpp index d400e46ce..b007cd311 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -4817,8 +4817,8 @@ void Client::MakeBuffFadePacket(uint16 spell_id, int slot_id, bool send_message) if(send_message) { const char *fadetext = spells[spell_id].spell_fades; - outapp = new EQApplicationPacket(OP_BuffFadeMsg, sizeof(BuffFadeMsg_Struct) + strlen(fadetext)); - BuffFadeMsg_Struct *bfm = (BuffFadeMsg_Struct *) outapp->pBuffer; + outapp = new EQApplicationPacket(OP_ColoredText, sizeof(ColoredText_Struct) + strlen(fadetext)); + ColoredText_Struct *bfm = (ColoredText_Struct *) outapp->pBuffer; bfm->color = MT_Spells; memcpy(bfm->msg, fadetext, strlen(fadetext)); QueuePacket(outapp);