- Merged the unit_data structure from jA for handling unit-related data (attack times, walking, auto-attack timers, skill related data)

- Modified unit_skillcastcancel to receive flag&2, which stands for "cancel casting only if current skill is cancellable"
- Battle config options changed from yes/no to BL_TYPE settings: skillrange_by_distance, skill_noreiteration, skill_nofootset, gvg_traps_target_all, skill_log, attack_direction_change, auto_counter_type
- Clif.c will disconnect sessions that send an unknown command packet above 0x30000 instead of just ignoring it.
- Cleaned up/rewrite of the pet ai, same for pet_calc_pos
- Implemented use of mob variable attacked_players as it is used on jA
- Cleaned up error reporting during mob-skill loading to be less spamy with non-loaded mobs.
- Corrected water_height reading. I forgot to give credits to LittleWolf for providing the water-reading function :X


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5707 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 4 insertions, 2 deletions

diff --git a/src/map/Makefile b/src/map/Makefile
index 071bfb38b..20934f7fc 100644
--- a/src/map/Makefile
+++ b/src/map/Makefile
@@ -24,7 +24,8 @@ OBJECTS = obj/map.o obj/chrif.o obj/clif.o obj/pc.o obj/status.o obj/npc.o \
 	obj/npc_chat.o obj/chat.o obj/path.o obj/itemdb.o obj/mob.o obj/script.o \

 	obj/storage.o obj/skill.o obj/atcommand.o obj/charcommand.o obj/battle.o \

 	obj/intif.o obj/trade.o obj/party.o obj/vending.o obj/guild.o obj/pet.o \

-	obj/log.o obj/mail.o obj/charsave.o obj/date.o obj/irc.o $(COMMON_OBJ)

+	obj/log.o obj/mail.o obj/charsave.o obj/date.o obj/irc.o obj/unit.o \

+	$(COMMON_OBJ)

 

 map-server: $(OBJECTS:obj/%=txtobj/%)

 	$(CC) -o ../../$@ $> $(LIBS) $(LIB_S)

@@ -69,7 +70,7 @@ txtobj/log.o: log.c log.h map.h $(COMMON_H)
 txtobj/charcommand.o: charcommand.c charcommand.h itemdb.h pc.h map.h skill.h clif.h mob.h intif.h battle.h storage.h guild.h pet.h log.h $(COMMON_H)

 txtobj/date.o: date.c date.h $(COMMON_H)

 txtobj/irc.o: irc.c irc.h map.h pc.h $(COMMON_H)

-

+txtobj/unit.o: unit.c unit.h $(COMMON_H)

 

 sqlobj/map.o: map.c map.h chrif.h clif.h npc.h pc.h mob.h chat.h skill.h itemdb.h storage.h party.h pet.h atcommand.h log.h irc.h $(COMMON_H)

 sqlobj/chrif.o: chrif.c map.h battle.h chrif.h clif.h intif.h pc.h npc.h $(COMMON_H)

@@ -99,3 +100,4 @@ sqlobj/charcommand.o: charcommand.c charcommand.h itemdb.h pc.h map.h skill.h cl
 sqlobj/charsave.o: charsave.c charsave.h $(COMMON_H)

 sqlobj/date.o: date.c date.h $(COMMON_H)

 sqlobj/irc.o: irc.c irc.h map.h pc.h $(COMMON_H)

+sqlobj/unit.o: unit.c unit.h $(COMMON_H)