Post merge adjustments

This commit is contained in:
Akkadius 2018-12-17 01:51:43 -06:00
parent 0681e6dbb2
commit 07ab96b883

View File

@ -40,7 +40,8 @@ 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_name,
const char *in_lastname, const char *in_lastname,
int32 in_cur_hp, int32 in_cur_hp,
int32 in_max_hp, int32 in_max_hp,
@ -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;
} }