diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-02-19 03:17:00 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-02-19 03:17:00 +0000 |
| commit | 267a456c643bca4185b56eb7cdd39bb2449bed90 (patch) | |
| tree | 9bbd56e2b15df080a1c8c44bf043e8ebea12719b | |
| parent | 72f1f6481da3a5cfeeec8c3b359e5baee9a63f46 (diff) | |
| download | hercules-267a456c643bca4185b56eb7cdd39bb2449bed90.tar.gz hercules-267a456c643bca4185b56eb7cdd39bb2449bed90.tar.bz2 hercules-267a456c643bca4185b56eb7cdd39bb2449bed90.tar.xz hercules-267a456c643bca4185b56eb7cdd39bb2449bed90.zip | |
* Fixed NPC_INVINCIBLE can be dispelled. (bugreport:4046)
* Fixed a compliation warning.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14247 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index f19d0418b..8d857dff0 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,9 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2010/02/19 + * Fixed NPC_INVINCIBLE can be dispelled. (bugreport:4046) [Inkfish] + * Fixed a compliation warning. [Inkfish] 2010/02/09 * Expanded range for cached and stored-in-db guild member exp (devotion) from uint32 to uint64. (bugreport:3983) [Paradox924X] * Capped value when sending to client to INT_MAX to prevent confusion. [Paradox924X] diff --git a/src/map/clif.c b/src/map/clif.c index db6d4a291..1eed2fd91 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6616,7 +6616,7 @@ int clif_guild_memberlist(struct map_session_data *sd) WFIFOW(fd,c*104+16)=m->gender; WFIFOW(fd,c*104+18)=m->class_; WFIFOW(fd,c*104+20)=m->lv; - WFIFOL(fd,c*104+22)=cap_value(m->exp,0,INT_MAX); + WFIFOL(fd,c*104+22)=(int)cap_value(m->exp,0,INT_MAX); WFIFOL(fd,c*104+26)=m->online; WFIFOL(fd,c*104+30)=m->position; memset(WFIFOP(fd,c*104+34),0,50); // ƒƒ‚H diff --git a/src/map/skill.c b/src/map/skill.c index 336d93975..dde93adbf 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4727,7 +4727,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case SC_READYSTORM: case SC_READYDOWN: case SC_READYTURN: case SC_READYCOUNTER:case SC_DODGE: case SC_WARM: case SC_SPEEDUP1: case SC_AUTOTRADE: case SC_CRITICALWOUND: - case SC_JEXPBOOST: + case SC_JEXPBOOST: case SC_INVINCIBLE: case SC_INVINCIBLEOFF: continue; case SC_ASSUMPTIO: if( bl->type == BL_MOB ) |