diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-09-06 19:15:17 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-09-06 19:15:17 +0000 |
| commit | 2678cc840bb707ff33378ba0d0cbfd8a737b5743 (patch) | |
| tree | 2516fdd31f588ba6557766f862b6373393acc862 /src/map/status.c | |
| parent | 36ea9e9c13d9f29203ba8c85a7f751f2433f5950 (diff) | |
| download | hercules-2678cc840bb707ff33378ba0d0cbfd8a737b5743.tar.gz hercules-2678cc840bb707ff33378ba0d0cbfd8a737b5743.tar.bz2 hercules-2678cc840bb707ff33378ba0d0cbfd8a737b5743.tar.xz hercules-2678cc840bb707ff33378ba0d0cbfd8a737b5743.zip | |
* Implemented Icescope's fix for devotion, reflect damage is no longer absorbed by the devoter. (bugreport:3189)
* As a folow up to r14301, increased MAX_REG_NUM to 256, to prevent possible data loss.
* Touched up the endless tower script slightly.
- Added ends to several NPCs which would allow you to restart timers.
- Added some missing stopnpctimers to npcs. (bugreport:4418)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14400 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c index f65771045..1e40018a5 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -640,6 +640,7 @@ int status_charge(struct block_list* bl, int hp, int sp) //If flag&2, fail if target does not has enough to substract. //If flag&4, if killed, mob must not give exp/loot. //If flag&8, sp loss on dead target. +//If flag&16, reflect damage is done, which can't be absorbed by Devotion. [icescope] int status_damage(struct block_list *src,struct block_list *target,int hp, int sp, int walkdelay, int flag) { struct status_data *status; @@ -680,7 +681,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s if( battle_config.invincible_nodamage && src && sc && sc->data[SC_INVINCIBLE] && !sc->data[SC_INVINCIBLEOFF] ) hp = 1; - if( hp && !(flag&(1|8)) ) { + if( hp && !(flag&(1|8|16)) ) { if( sc ) { struct status_change_entry *sce; if( (sce = sc->data[SC_DEVOTION]) && src && battle_getcurrentskill(src) != PA_PRESSURE ) |