diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-23 11:57:11 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-23 11:57:11 +0000 |
| commit | 211a15e56f8ec2344790421930024d2eb401f291 (patch) | |
| tree | 978c25d30ecd5a55fca8868f0c7c9751db04f5c4 | |
| parent | 81bb8f84dd3a655e44610dc5a2d60a3aad912a21 (diff) | |
| download | hercules-211a15e56f8ec2344790421930024d2eb401f291.tar.gz hercules-211a15e56f8ec2344790421930024d2eb401f291.tar.bz2 hercules-211a15e56f8ec2344790421930024d2eb401f291.tar.xz hercules-211a15e56f8ec2344790421930024d2eb401f291.zip | |
Fixed bugreport:6297 where Cart can be dispelled by SA_DISPELL and AB_CLEARANCE.
Little code optimization from r16478.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16482 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/script.c | 18 | ||||
| -rw-r--r-- | src/map/skill.c | 4 |
2 files changed, 3 insertions, 19 deletions
diff --git a/src/map/script.c b/src/map/script.c index 91d063daf..9521f2d54 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -16454,64 +16454,48 @@ BUILDIN_FUNC(checkre) case 0: #ifdef RENEWAL script_pushint(st, 1); - #else - script_pushint(st, 0); #endif break; case 1: #ifdef RENEWAL_CAST script_pushint(st, 1); - #else - script_pushint(st, 0); #endif break; case 2: #ifdef RENEWAL_DROP script_pushint(st, 1); - #else - script_pushint(st, 0); #endif break; case 3: #ifdef RENEWAL_EXP script_pushint(st, 1); - #else - script_pushint(st, 0); #endif break; case 4: #ifdef RENEWAL_LVDMG script_pushint(st, 1); - #else - script_pushint(st, 0); #endif break; case 5: #ifdef RENEWAL_CAST_VMIN script_pushint(st, 1); - #else - script_pushint(st, 0); #endif break; case 6: #ifdef RENEWAL_EDP script_pushint(st, 1); - #else - script_pushint(st, 0); #endif break; case 7: #ifdef RENEWAL_ASPD script_pushint(st, 1); - #else - script_pushint(st, 0); #endif break; - default: ShowWarning("buildin_checkre: unknown parameter.\n"); break; } + script_pushint(st, 0); return 0; } diff --git a/src/map/skill.c b/src/map/skill.c index 15c03590b..458cf7518 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6211,7 +6211,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case SC_REFRESH: case SC_STONEHARDSKIN: case SC_VITALITYACTIVATION: case SC_FIGHTINGSPIRIT: case SC_ABUNDANCE: case SC__SHADOWFORM: case SC_LEADERSHIP: case SC_GLORYWOUNDS: case SC_SOULCOLD: - case SC_HAWKEYES: case SC_GUILDAURA: + case SC_HAWKEYES: case SC_GUILDAURA: case SC_PUSH_CART: continue; /** * bugreport:4888 these songs may only be dispelled if you're not in their song area anymore @@ -7556,7 +7556,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case SC_NEUTRALBARRIER_MASTER: case SC_NEUTRALBARRIER: case SC_STEALTHFIELD_MASTER: case SC_STEALTHFIELD: case SC_LEADERSHIP: case SC_GLORYWOUNDS: case SC_SOULCOLD: - case SC_HAWKEYES: case SC_GUILDAURA: + case SC_HAWKEYES: case SC_GUILDAURA: case SC_PUSH_CART: continue; case SC_ASSUMPTIO: if( bl->type == BL_MOB ) |