diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-06 18:47:11 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-06 18:47:11 +0000 |
| commit | f0fa9794bcdde0b1402bb7a7256265f59bbd7313 (patch) | |
| tree | 7b63a598956cf1c3acf681c13112f5d6c4278e93 /src/map/map.c | |
| parent | b1b0860d1ca7e0f9ddb57756be9af11d9557d555 (diff) | |
| download | hercules-f0fa9794bcdde0b1402bb7a7256265f59bbd7313.tar.gz hercules-f0fa9794bcdde0b1402bb7a7256265f59bbd7313.tar.bz2 hercules-f0fa9794bcdde0b1402bb7a7256265f59bbd7313.tar.xz hercules-f0fa9794bcdde0b1402bb7a7256265f59bbd7313.zip | |
- 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
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 6 |
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; |