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

Added support for all SE_EyeOfZomm and some other small changes

Browse Source
This commit is contained in:
Noudess 2019-10-28 19:48:31 -04:00
parent 194c61a467
commit 566e6ea307
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zone/aa.cpp
View File

@ -36,7 +36,7 @@ Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
extern QueryServ* QServ; extern QueryServ* QServ;
void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, uint32 duration_override, bool followme, bool sticktarg) { void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, uint32 duration_override, bool followme, bool sticktarg, uint16 *eye_id) {
//It might not be a bad idea to put these into the database, eventually.. //It might not be a bad idea to put these into the database, eventually..
@ -164,8 +164,8 @@ void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, u
summon_count--; summon_count--;
} }
if (IsClient() && spell_id == SPELL_EYE_OF_ZOMM) { if (IsClient() && eye_id != nullptr) {
CastToClient()->SetControlledMobId(swarm_pet_npc->GetID()); *eye_id = swarm_pet_npc->GetID();
} }
//the target of these swarm pets will take offense to being cast on... //the target of these swarm pets will take offense to being cast on...

2
zone/client_packet.cpp
View File

@ -10784,7 +10784,7 @@ void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app)
} }
char buf[16]; char buf[16];
sprintf(buf, "%d\0", popup_response->popupid); sprintf(buf, "%d", popup_response->popupid);
parse->EventPlayer(EVENT_POPUP_RESPONSE, this, buf, 0); parse->EventPlayer(EVENT_POPUP_RESPONSE, this, buf, 0);

2
zone/mob.cpp
View File

@ -1208,7 +1208,7 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho)
// Changing the second string made no visible difference // Changing the second string made no visible difference
sprintf(ns->spawn.DestructibleName2, "%s", ns->spawn.name); sprintf(ns->spawn.DestructibleName2, "%s", ns->spawn.name);
// Putting a string in the final one that was previously empty had no visible effect. // Putting a string in the final one that was previously empty had no visible effect.
sprintf(ns->spawn.DestructibleString, ""); ns->spawn.DestructibleString[0] = '\0';
// Sets damage appearance level of the object. // Sets damage appearance level of the object.
ns->spawn.DestructibleAppearance = luclinface; // Was 0x00000000 ns->spawn.DestructibleAppearance = luclinface; // Was 0x00000000

2
zone/mob.h
View File

@ -762,7 +762,7 @@ public:
virtual void UnStun(); virtual void UnStun();
inline void Silence(bool newval) { silenced = newval; } inline void Silence(bool newval) { silenced = newval; }
inline void Amnesia(bool newval) { amnesiad = newval; } inline void Amnesia(bool newval) { amnesiad = newval; }
void TemporaryPets(uint16 spell_id, Mob *target, const char *name_override = nullptr, uint32 duration_override = 0, bool followme=true, bool sticktarg=false); void TemporaryPets(uint16 spell_id, Mob *target, const char *name_override = nullptr, uint32 duration_override = 0, bool followme=true, bool sticktarg=false, uint16 *controlled_pet_id = nullptr);
void TypesTemporaryPets(uint32 typesid, Mob *target, const char *name_override = nullptr, uint32 duration_override = 0, bool followme=true, bool sticktarg=false); void TypesTemporaryPets(uint32 typesid, Mob *target, const char *name_override = nullptr, uint32 duration_override = 0, bool followme=true, bool sticktarg=false);
void WakeTheDead(uint16 spell_id, Mob *target, uint32 duration); void WakeTheDead(uint16 spell_id, Mob *target, uint32 duration);
void Spin(); void Spin();

6
zone/spell_effects.cpp
View File

@ -1561,7 +1561,11 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
char eye_name[64]; char eye_name[64];
snprintf(eye_name, sizeof(eye_name), "Eye_of_%s", caster->GetCleanName()); snprintf(eye_name, sizeof(eye_name), "Eye_of_%s", caster->GetCleanName());
int duration = CalcBuffDuration(caster, this, spell_id) * 6; int duration = CalcBuffDuration(caster, this, spell_id) * 6;
caster->TemporaryPets(spell_id, nullptr, eye_name, duration, false); uint16 eye_id=0;
caster->TemporaryPets(spell_id, nullptr, eye_name, duration, false, false, &eye_id);
if (eye_id != 0) {
caster->CastToClient()->SetControlledMobId(eye_id);
}
} }
break; break;
} }