diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-07-17 22:01:54 +0200 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-07-17 22:01:54 +0200 |
| commit | 538b81540c7e04c5b1793d50aaf9ac8958878524 (patch) | |
| tree | 3e91d482f341fffc4addacd96112407af2db50e6 /src/game-server/monster.h | |
| parent | 9091c129381ae18831707a5005c8c7626408298b (diff) | |
| parent | 7a72ec38d336ed56d2759795d4b9db59b76868b8 (diff) | |
| download | manaserv-538b81540c7e04c5b1793d50aaf9ac8958878524.tar.gz manaserv-538b81540c7e04c5b1793d50aaf9ac8958878524.tar.bz2 manaserv-538b81540c7e04c5b1793d50aaf9ac8958878524.tar.xz manaserv-538b81540c7e04c5b1793d50aaf9ac8958878524.zip | |
Merge branch 'master' into lpc2012
Conflicts:
src/game-server/character.h
Diffstat (limited to 'src/game-server/monster.h')
| -rw-r--r-- | src/game-server/monster.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game-server/monster.h b/src/game-server/monster.h index 8e87d758..a1a82eb5 100644 --- a/src/game-server/monster.h +++ b/src/game-server/monster.h @@ -315,6 +315,9 @@ class Monster : public Being */ void changeAnger(Actor *target, int amount); + const std::map<Being *, int> &getAngerList() const + { return mAnger; } + /** * Calls the damage function in Being and updates the aggro list */ |