- Fixed Freezing Trap doing no damage (changed type from misc to weapon)

- Changed suiton's element to water (apparently fixes not being able to use water-based skills on it)
- Fixed Landmine doing no damage (decreased trigger range to 0 to match its splash range)
- Fixed the disguise commands using the wrong variable when attempting to disguise as an npc.
- Fixed a compilation warning on CELL_CHKNODAMAGE (which is a totally bad-ripoff of basilica cells anyway)
- Corrected and optimized npc_remove_map's npc array cleanup (@reloadscripts no longer report 'too many npcs per map and related dangling pointer crashes are fixed)
- Removed suspicious, yet totally unused npc_data variable 'n'
- HP loss item scripts can no longer kill you.
- Corrected the item-drop-rate check to avoid duplicate entries in @whodrops after a @reloadmobdb
- Cleaned up and optimized map_addnpc (there are never any gaps in the npc array so npc_num always points to the last valid entry)


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

1 files changed, 1 insertions, 2 deletions

diff --git a/src/map/map.h b/src/map/map.h
index 457494dab..84d041569 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -807,7 +807,6 @@ struct npc_data {
 	struct view_data *vd;
 	struct status_change sc; //They can't have status changes, but.. they want the visual opt values.
 	struct npc_data *master_nd;
-	short n;
 	short class_;
 	short speed;
 	char name[NAME_LENGTH+1];// display name
@@ -1295,7 +1294,7 @@ bool map_knowsaccount(int account_id);
 int map_quit(struct map_session_data *);
 void map_quit_ack(int account_id, int char_id);
 // npc
-int map_addnpc(int,struct npc_data *);
+bool map_addnpc(int,struct npc_data *);
 
 // 床アイテム関連
 int map_clearflooritem_timer(int,unsigned int,int,int);