- Added EQP_/EQI_ constants in pc.h to identify equip position and equip indexes, makes equipping related code much easier to read.

- Also cleaned up pc_equipitem. When dual wielding or equipping accessories, if the client actually specifies one of the two positions, it will be taken into account.


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

1 files changed, 2 insertions, 4 deletions

diff --git a/src/map/map.c b/src/map/map.c
index a93b03257..c5a4bb314 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -290,15 +290,13 @@ int map_freeblock_lock (void)
  * バッファにたまっていたblockを全部削除
  *------------------------------------------
  */
-//Temporal debug function to figure out which unlock is causing already free'd pointer errors.
-int map_freeblock_unlock_sub(const char * file, int line)
+int map_freeblock_unlock (void)
 {
 	if ((--block_free_lock) == 0) {
 		int i;
 		for (i = 0; i < block_free_count; i++)
 		{	//Directly calling aFree shouldn't be a leak, as Free remembers the size the original pointed to memory was allocated with? [Skotlex]
-//			aFree(block_free[i]);
-			_mfree(block_free[i], file, line, __func__);
+			aFree(block_free[i]);
 			block_free[i] = NULL;
 		}
 		block_free_count = 0;