- Corrected Musical Strike having a different damage equation from Throw Arrow.

- Some minor cleanup of Soul Change 
- Added state rewarp to players. It gets set when a pc_setpos call is triggered while the player is changing maps so that when the player finish loading the map, it is inmediately rewarped to where it has been rewarped/recalled to.


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

1 files changed, 10 insertions, 5 deletions

diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 7651535f1..80a58a520 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -285,7 +285,6 @@ static int itemdb_ispetequip(struct item_data *data)
 	}

 }

 

-

 /*==========================================

  * Trade Restriction functions [Skotlex]

  *------------------------------------------

@@ -598,7 +597,7 @@ static int itemdb_read_itemslottable(void)
 		struct item_data* item;

 		sscanf(p, "%d#%d#", &nameid, &equip);

 		item = itemdb_search(nameid);

-		if (equip && item && itemdb_isequip2(item))			

+		if (equip && item && itemdb_isequip2(item))

 			item->equip = equip;

 		p = strchr(p, 10);

 		if(!p) break;

@@ -1184,12 +1183,18 @@ void itemdb_reload(void)
 void do_final_itemdb(void)

 {

 	item_db->destroy(item_db, itemdb_final_sub, 1);

-	if (dummy_item.script)

+	if (dummy_item.script) {

 		script_free_code(dummy_item.script);

-	if (dummy_item.equip_script)

+		dummy_item.script = NULL;

+	}

+	if (dummy_item.equip_script) {

 		script_free_code(dummy_item.equip_script);

-	if (dummy_item.unequip_script)

+		dummy_item.equip_script = NULL;

+	}

+	if (dummy_item.unequip_script) {

 		script_free_code(dummy_item.unequip_script);

+		dummy_item.unequip_script = NULL;

+	}

 }

 

 int do_init_itemdb(void)