summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcookiecrumbs <cookiecrumbs@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-18 04:02:18 +0000
committercookiecrumbs <cookiecrumbs@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-18 04:02:18 +0000
commit6f4a6ea70d8d599e81ef5f4cf762dd5e2ad20b4c (patch)
treeceeabe99a98a67081a571995d2e54ccbba49e126 /src
parentd8811530437c97cdb20517b6c40f9bb5fb17ccde (diff)
downloadhercules-6f4a6ea70d8d599e81ef5f4cf762dd5e2ad20b4c.tar.gz
hercules-6f4a6ea70d8d599e81ef5f4cf762dd5e2ad20b4c.tar.bz2
hercules-6f4a6ea70d8d599e81ef5f4cf762dd5e2ad20b4c.tar.xz
hercules-6f4a6ea70d8d599e81ef5f4cf762dd5e2ad20b4c.zip
Fixed an issue where when a trap was set that required a Special Alloy Trap, the returning trap was a Trap instead of Special Alloy Trap. bugreport:6263
Removed accidental inclusion of my name in the previous revision. r16439 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16440 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/status.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index cba56d3fe..969c8c007 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -14634,7 +14634,7 @@ static int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap)
{ // revert unit back into a trap
struct item item_tmp;
memset(&item_tmp,0,sizeof(item_tmp));
- item_tmp.nameid = ITEMID_TRAP;
+ item_tmp.nameid = ( group->unit_id >= UNT_MAGENTATRAP && group->unit_id <= UNT_CLUSTERBOMB )?ITEMID_TRAP_ALLOY:ITEMID_TRAP; // Ensure we're returning the correct trap
item_tmp.identify = 1;
map_addflooritem(&item_tmp,1,bl->m,bl->x,bl->y,0,0,0,0);
}
diff --git a/src/map/status.c b/src/map/status.c
index a37a80ab2..e2a61f393 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1681,7 +1681,7 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
if (tsc->option&hide_flag && !is_boss &&
(sd->special_state.perfect_hiding || !is_detect) )
return 0;
- if( tsc->data[SC_CLOAKINGEXCEED] && !(is_boss) && (status->mode&(RC_INSECT|RC_DEMON)) ) // Cloaking Exceed => undetected from insect & demon except bosses [Cookie]
+ if( tsc->data[SC_CLOAKINGEXCEED] && !(is_boss) && (status->mode&(RC_INSECT|RC_DEMON)) ) // Cloaking Exceed => undetected from insect & demon except bosses
return 0;
if( tsc->data[SC_CAMOUFLAGE] && !(is_boss || is_detect) && !skill_num )
return 0;