diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-05 19:14:58 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-05 19:14:58 +0000 |
| commit | 6cb1278f000d3a9a14d2a5d2c30d2b008894a6b7 (patch) | |
| tree | bdd59dd002425dca42739d9afadbde3dee6ae33e | |
| parent | db904cf8febd9a2097a49ab7af9447379e2ae749 (diff) | |
| download | hercules-6cb1278f000d3a9a14d2a5d2c30d2b008894a6b7.tar.gz hercules-6cb1278f000d3a9a14d2a5d2c30d2b008894a6b7.tar.bz2 hercules-6cb1278f000d3a9a14d2a5d2c30d2b008894a6b7.tar.xz hercules-6cb1278f000d3a9a14d2a5d2c30d2b008894a6b7.zip | |
- Fixed remove trap by updating the definition of INF_GROUND_SKILL (it shouldn't include target-targetting skills!)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5468 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/skill.c | 4 | ||||
| -rw-r--r-- | src/map/skill.h | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 48725947c..bf206894a 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/05
+ * Fixed remove-trap [Skotlex]
* Fixed animation of Redemptio [Skotlex]
* Some reorganization of how the skill check functions behave
(skill_get_*). Guild skills have been moved to the range 900~915 (instead
diff --git a/src/map/skill.c b/src/map/skill.c index 03aa4ca3c..5085dd94f 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3041,7 +3041,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s break;
default:
- ShowWarning("Unknown skill used:%d\n",skillid);
+ ShowWarning("skill_castend_damage_id: Unknown skill used:%d\n",skillid);
map_freeblock_unlock();
return 1;
}
@@ -5536,7 +5536,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in break;
default:
- ShowWarning("Unknown skill used:%d\n",skillid);
+ ShowWarning("skill_castend_nodamage_id: Unknown skill used:%d\n",skillid);
map_freeblock_unlock();
return 1;
}
diff --git a/src/map/skill.h b/src/map/skill.h index 46752ed11..a87daa66a 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -14,8 +14,7 @@ //Constants to identify the skill's inf value:
#define INF_ATTACK_SKILL 1
-//For the time being, all trap-targetted skills ARE ground based:
-#define INF_GROUND_SKILL (2|32)
+#define INF_GROUND_SKILL 2
// Skills casted on self where target is automatically chosen:
#define INF_SELF_SKILL 4
#define INF_SUPPORT_SKILL 16
|