pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 04:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
KimLS
2013-05-24 01:23:58 -07:00
parent a3e24b6854 52b8c0e078
commit e47de5deed
54 changed files with 572 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob.h
+9 -8
View File
@@ -972,11 +972,6 @@ protected:
Timer tic_timer;
Timer mana_timer;
float rewind_x;
float rewind_y;
float rewind_z;
Timer rewind_timer;
//spell casting vars
Timer spellend_timer;
uint16 casting_spell_id;
@@ -995,6 +990,11 @@ protected:
uint8 bardsong_slot;
uint32 bardsong_target_id;
float rewind_x;
float rewind_y;
float rewind_z;
Timer rewind_timer;
// Currently 3 max nimbus particle effects at a time
uint32 nimbus_effect1;
uint32 nimbus_effect2;
@@ -1029,6 +1029,10 @@ protected:
int16 rooted_mod; //Modifier to root break chance, defined when root is cast on a target.
bool offhand;
// Bind wound
Timer bindwound_timer;
Mob* bindwound_target;
Timer stunned_timer;
Timer spun_timer;
Timer bardsong_timer;
@@ -1111,9 +1115,6 @@ protected:
uint32 pDontSnareMeBefore;
uint32 pDontCureMeBefore;
// Bind wound
Timer bindwound_timer;
Mob* bindwound_target;
// hp event
int nexthpevent;
int nextinchpevent;