diff options
author | Jared Adams <jaxad0127@gmail.com> | 2008-11-02 00:19:12 +0000 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2008-11-02 00:19:12 +0000 |
commit | 8d356dbe3f056474700fcbdd563d8ea437b1464e (patch) | |
tree | 682694884b5cae5a9f6ec9136619ac2a90c8f73e /src/map/magic-stmt.c | |
parent | ff4ed0b105b016aa3a7dad07db5fb00456bbe822 (diff) | |
download | tmwa-8d356dbe3f056474700fcbdd563d8ea437b1464e.tar.gz tmwa-8d356dbe3f056474700fcbdd563d8ea437b1464e.tar.bz2 tmwa-8d356dbe3f056474700fcbdd563d8ea437b1464e.tar.xz tmwa-8d356dbe3f056474700fcbdd563d8ea437b1464e.zip |
* Minor cleanup in login server
* Char server now records client version and reports it to map server
* Map server will now report all skills (even ones with dangerous indices) for client version 1 and above
* Use status change val1 (instead of val2) index for speed potions, so that they can be triggered more easily from within scripts
* Item database now also keeps track of the effect that items have on the spower stat
* spower is now based on level + int*2 + modifier (see last point)
* Minor bugfixes in support functionality for the SLang interpreter
- Do not restart the map server without also restarting the char server, as the interserver protocol has changed slightly!
(patch by fate)
Diffstat (limited to 'src/map/magic-stmt.c')
-rw-r--r-- | src/map/magic-stmt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/magic-stmt.c b/src/map/magic-stmt.c index 30b79d1..9760674 100644 --- a/src/map/magic-stmt.c +++ b/src/map/magic-stmt.c @@ -692,9 +692,10 @@ op_injure(env_t *env, int args_nr, val_t *args) damage_caused = 0; if (damage_caused || mp_damage) { - battle_damage(caster, target, damage_caused, mp_damage); + // display damage first, because dealing damage may deallocate the target. clif_damage(caster, target, gettick(), 0, 0, damage_caused, 0, 0, 0); + battle_damage(caster, target, damage_caused, mp_damage); } return 0; |