diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-27 14:54:40 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-27 14:54:40 +0000 |
| commit | 50e31d2860fe8f754d186a35ac1b4b61f653af5a (patch) | |
| tree | 2ddbbc4bc094e98daca48f38b5130beb320d50cb /src/map/skill.c | |
| parent | 7e54a062e03f14bb1540f6b4ff249cf888d5ea35 (diff) | |
| download | hercules-50e31d2860fe8f754d186a35ac1b4b61f653af5a.tar.gz hercules-50e31d2860fe8f754d186a35ac1b4b61f653af5a.tar.bz2 hercules-50e31d2860fe8f754d186a35ac1b4b61f653af5a.tar.xz hercules-50e31d2860fe8f754d186a35ac1b4b61f653af5a.zip | |
- Pet catching now uses the menuskill variables to prevent item usage from disrupting the catch process.
- Added Safetywall to the list not blocked by Dispell.
- Added some include limits.h required by window compiles.
- Corrected Wedding rings being trade-able.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5772 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 3d8aa3544..992ed9ea1 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4616,6 +4616,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in || i==SC_CP_WEAPON || i==SC_CP_SHIELD || i==SC_CP_ARMOR || i==SC_CP_HELM
|| i==SC_COMBO || i==SC_DANCING || i==SC_GUILDAURA || i==SC_EDP
|| i==SC_AUTOBERSERK || i==SC_CARTBOOST || i==SC_MELTDOWN || i==SC_MOONLIT
+ || i==SC_SAFETYWALL
)
continue;
if(i==SC_BERSERK) tsc->data[i].val4=1; //Mark a dispelled berserk to avoid setting hp to 100.
|