summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-25 23:58:19 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-25 23:58:19 +0000
commitc776066a6116c2e2bfcd73eab7bcf2c044442292 (patch)
tree006717c1b3f4dac8e8d96217d67fb0a503f13436 /src/map/clif.c
parent32a5e256118b92e2dd1b6e2ed0b7417e44f00e66 (diff)
downloadhercules-c776066a6116c2e2bfcd73eab7bcf2c044442292.tar.gz
hercules-c776066a6116c2e2bfcd73eab7bcf2c044442292.tar.bz2
hercules-c776066a6116c2e2bfcd73eab7bcf2c044442292.tar.xz
hercules-c776066a6116c2e2bfcd73eab7bcf2c044442292.zip
- Renamed skill_clear_element_field to skill_clear_group, it accepts a flag to determine what to erase. &1 for elemental fields, &2 for traps. Also rewrote how it works to prevent missing elements (since each time an element is erased, the array contents shift)
- Added battle config traps_setting to determine how traps should behave. With &1 traps are invisible if you didn't see them get set up. With &2 traps will be removed after changing maps. The default is 2. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6285 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index bdc81724d..8429b3d23 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3887,7 +3887,10 @@ int clif_getareachar_skillunit(struct map_session_data *sd,struct skill_unit *un
WFIFOW(fd,10)=unit->bl.x;
WFIFOW(fd,12)=unit->bl.y;
//Use invisible unit id for traps.
- WFIFOB(fd,14)=(skill_get_inf2(unit->group->skill_id)&INF2_TRAP?UNT_ATTACK_SKILLS:unit->group->unit_id);
+ if (battle_config.traps_setting&1 && skill_get_inf2(unit->group->skill_id)&INF2_TRAP)
+ WFIFOB(fd,14)=UNT_ATTACK_SKILLS;
+ else
+ WFIFOB(fd,14)=unit->group->unit_id;
WFIFOB(fd,15)=0;
WFIFOSET(fd,packet_len_table[0x11f]);