Browse Source

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://svn.code.sf.net/p/rathena/svn/trunk@16440 54d463be-8e91-2dee-dedb-b68131a5f0ec

cookiecrumbs 13 years ago
parent
commit
6e9e36e2d6
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/map/skill.c
  2. 1 1
      src/map/status.c

+ 1 - 1
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);
 				}

+ 1 - 1
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;