pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-15 04:11:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Post merge adjustments

Browse Source
This commit is contained in:
Akkadius 2018-12-17 01:51:43 -06:00
parent 0681e6dbb2
commit 07ab96b883
1 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zone/mob.cpp
View File

@ -40,8 +40,9 @@ extern EntityList entity_list;
extern Zone* zone; extern Zone* zone;
extern WorldServer worldserver; extern WorldServer worldserver;
Mob::Mob(const char* in_name, Mob::Mob(
const char* in_lastname, const char *in_name,
const char *in_lastname,
int32 in_cur_hp, int32 in_cur_hp,
int32 in_max_hp, int32 in_max_hp,
uint8 in_gender, uint8 in_gender,
@ -53,7 +54,7 @@ Mob::Mob(const char* in_name,
uint32 in_npctype_id, uint32 in_npctype_id,
float in_size, float in_size,
float in_runspeed, float in_runspeed,
const glm::vec4& position, const glm::vec4 &position,
uint8 in_light, uint8 in_light,
uint8 in_texture, uint8 in_texture,
uint8 in_helmtexture, uint8 in_helmtexture,
@ -92,7 +93,7 @@ Mob::Mob(const char* in_name,
uint8 in_handtexture, uint8 in_handtexture,
uint8 in_legtexture, uint8 in_legtexture,
uint8 in_feettexture uint8 in_feettexture
) : ) :
attack_timer(2000), attack_timer(2000),
attack_dw_timer(2000), attack_dw_timer(2000),
ranged_timer(2000), ranged_timer(2000),
@ -122,8 +123,6 @@ Mob::Mob(const char* in_name,
targeted = 0; targeted = 0;
currently_fleeing = false; currently_fleeing = false;
currently_fleeing = false;
AI_Init(); AI_Init();
SetMoving(false); SetMoving(false);
moved = false; moved = false;
@ -161,6 +160,7 @@ Mob::Mob(const char* in_name,
// neotokyo: sanity check // neotokyo: sanity check
if (runspeed < 0 || runspeed > 20) { if (runspeed < 0 || runspeed > 20) {
runspeed = 1.25f; runspeed = 1.25f;
}
// clients -- todo movement this doesn't take into account gm speed we need to fix that. // clients -- todo movement this doesn't take into account gm speed we need to fix that.
@ -393,7 +393,7 @@ Mob::Mob(const char* in_name,
rooted = false; rooted = false;
charmed = false; charmed = false;
has_virus = false; has_virus = false;
for (i = 0; i < MAX_SPELL_TRIGGER * 2; i++) { for (int i = 0; i < MAX_SPELL_TRIGGER * 2; i++) {
viral_spells[i] = 0; viral_spells[i] = 0;
} }