Merge branch 'master' of github.com:EQEmu/Server

This commit is contained in:
KimLS
2014-02-22 15:04:18 -08:00
43 changed files with 1292 additions and 710 deletions
+3 -1
View File
@@ -192,6 +192,8 @@ public:
void SetHate(Lua_Mob other);
void SetHate(Lua_Mob other, int hate);
void SetHate(Lua_Mob other, int hate, int damage);
void HalveAggro(Lua_Mob other);
void DoubleAggro(Lua_Mob other);
uint32 GetHateAmount(Lua_Mob target);
uint32 GetHateAmount(Lua_Mob target, bool is_damage);
uint32 GetDamageAmount(Lua_Mob target);
@@ -346,4 +348,4 @@ public:
};
#endif
#endif
#endif