summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-24 21:30:38 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-24 21:30:38 +0000
commitddcceef5e3e484c16ef29cc756aa5784ad3ee9cf (patch)
treebdc44eb384a9e35e88a6517110cccbd95fca8674 /src/map
parenta52fadeed054305bf477534143b303c48f40f681 (diff)
downloadhercules-ddcceef5e3e484c16ef29cc756aa5784ad3ee9cf.tar.gz
hercules-ddcceef5e3e484c16ef29cc756aa5784ad3ee9cf.tar.bz2
hercules-ddcceef5e3e484c16ef29cc756aa5784ad3ee9cf.tar.xz
hercules-ddcceef5e3e484c16ef29cc756aa5784ad3ee9cf.zip
- Heaven's drive no longer targets traps.
- Some minor cleanups git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9316 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/status.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index ccfd7d326..561c51912 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5085,7 +5085,7 @@ int clif_GMmessage(struct block_list *bl, char* mes, int len, int flag)
WBUFW(buf,0) = 0x9a;
WBUFW(buf,2) = len + lp;
- WBUFL(buf,4) = 0x65756c62;
+ WBUFL(buf,4) = 0x65756c62; //"blue":
memcpy(WBUFP(buf,lp), mes, len);
flag &= 0x07;
clif_send(buf, WBUFW(buf,2), bl,
diff --git a/src/map/status.c b/src/map/status.c
index 61a86f697..998a9b5eb 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1028,7 +1028,7 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
//Skill blocking.
if (
(sc->data[SC_VOLCANO].timer != -1 && skill_num == WZ_ICEWALL) ||
- (sc->data[SC_ROKISWEIL].timer != -1 && skill_num != BD_ADAPTATION && !(status->mode&MD_BOSS)) ||
+ (sc->data[SC_ROKISWEIL].timer != -1 && skill_num != BD_ADAPTATION) ||
(sc->data[SC_HERMODE].timer != -1 && skill_get_inf(skill_num) & INF_SUPPORT_SKILL) ||
(sc->data[SC_NOCHAT].timer != -1 && sc->data[SC_NOCHAT].val1&MANNER_NOSKILL)
)