Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bugreport:6297 where Cart can be dispelled by SA_DISPELL and AB_CLEARANCE.

Browse Source 
Little code optimization from r16478.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16482 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
rud0lp20 2012-07-23 11:57:11 +00:00
parent 96d35fa20e
commit 2364714b7c
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/map/script.c
View File

@ -16454,64 +16454,48 @@ BUILDIN_FUNC(checkre)
case 0: case 0:
#ifdef RENEWAL #ifdef RENEWAL
script_pushint(st, 1); script_pushint(st, 1);
#else
script_pushint(st, 0);
#endif #endif
break; break;
case 1: case 1:
#ifdef RENEWAL_CAST #ifdef RENEWAL_CAST
script_pushint(st, 1); script_pushint(st, 1);
#else
script_pushint(st, 0);
#endif #endif
break; break;
case 2: case 2:
#ifdef RENEWAL_DROP #ifdef RENEWAL_DROP
script_pushint(st, 1); script_pushint(st, 1);
#else
script_pushint(st, 0);
#endif #endif
break; break;
case 3: case 3:
#ifdef RENEWAL_EXP #ifdef RENEWAL_EXP
script_pushint(st, 1); script_pushint(st, 1);
#else
script_pushint(st, 0);
#endif #endif
break; break;
case 4: case 4:
#ifdef RENEWAL_LVDMG #ifdef RENEWAL_LVDMG
script_pushint(st, 1); script_pushint(st, 1);
#else
script_pushint(st, 0);
#endif #endif
break; break;
case 5: case 5:
#ifdef RENEWAL_CAST_VMIN #ifdef RENEWAL_CAST_VMIN
script_pushint(st, 1); script_pushint(st, 1);
#else
script_pushint(st, 0);
#endif #endif
break; break;
case 6: case 6:
#ifdef RENEWAL_EDP #ifdef RENEWAL_EDP
script_pushint(st, 1); script_pushint(st, 1);
#else
script_pushint(st, 0);
#endif #endif
break; break;
case 7: case 7:
#ifdef RENEWAL_ASPD #ifdef RENEWAL_ASPD
script_pushint(st, 1); script_pushint(st, 1);
#else
script_pushint(st, 0);
#endif #endif
break; break;
default: default:
ShowWarning("buildin_checkre: unknown parameter.\n"); ShowWarning("buildin_checkre: unknown parameter.\n");
break; break;
} }
script_pushint(st, 0);
return 0; return 0;
} }

4
src/map/skill.c
View File

@ -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_REFRESH: case SC_STONEHARDSKIN: case SC_VITALITYACTIVATION:
case SC_FIGHTINGSPIRIT: case SC_ABUNDANCE: case SC__SHADOWFORM: case SC_FIGHTINGSPIRIT: case SC_ABUNDANCE: case SC__SHADOWFORM:
case SC_LEADERSHIP: case SC_GLORYWOUNDS: case SC_SOULCOLD: 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; continue;
/** /**
* bugreport:4888 these songs may only be dispelled if you're not in their song area anymore * 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_NEUTRALBARRIER_MASTER: case SC_NEUTRALBARRIER:
case SC_STEALTHFIELD_MASTER: case SC_STEALTHFIELD: case SC_STEALTHFIELD_MASTER: case SC_STEALTHFIELD:
case SC_LEADERSHIP: case SC_GLORYWOUNDS: case SC_SOULCOLD: 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; continue;
case SC_ASSUMPTIO: case SC_ASSUMPTIO:
if( bl->type == BL_MOB ) if( bl->type == BL_MOB )