summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-06 14:37:44 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-06 14:37:44 +0000
commit7ada5312d478e4f56e8829779eb8c977877c99c2 (patch)
tree107125b7f161e95e1f520072d5a9ecc959dd0ce7 /src/map/skill.c
parent374f1656a59e2130ed4ee7bb7520ff5dc2bf6b82 (diff)
downloadhercules-7ada5312d478e4f56e8829779eb8c977877c99c2.tar.gz
hercules-7ada5312d478e4f56e8829779eb8c977877c99c2.tar.bz2
hercules-7ada5312d478e4f56e8829779eb8c977877c99c2.tar.xz
hercules-7ada5312d478e4f56e8829779eb8c977877c99c2.zip
- Fixed a debug message showing up on skill castend nodamage id when using a guild skill
- Fixed #save not working on maps not in the current map server. - Added battle config clear_skills_on_death to decide whether all ground-based skills should be removed when you die. Defaults to yes. - Changed Magic Crasher's element to -1 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5472 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 5085dd94f..9061078b8 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3064,9 +3064,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
struct mob_data *dstmd = NULL;
int i,type=-1;
- if(skillid < 0 || skillid > MAX_SKILL)
+ if(skillid < 0 || (skillid > MAX_SKILL || (skillid >= GD_SKILLBASE && skillid > GD_SKILLBASE + MAX_GUILDSKILL)))
{ // remove the debug print when this case is finished
- ShowDebug("skill_castend_nodamage_id: skillid=%i\ncall: %p %p %i %i %i %i",skillid,
+ ShowDebug("skill_castend_nodamage_id: skillid=%i call: %p %p %i %i %i %i\n",skillid,
src, bl,skillid,skilllv,tick,flag);
return 0;
}