* Added status.c and status.h of jA 1091 update and moved some functions into the new source files

* Updated auto_counter_type's description in battle_athena
* Removed some unnecessary skill level checks in battle.c

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

1 files changed, 45 insertions, 43 deletions

diff --git a/src/common/malloc.h b/src/common/malloc.h
index b37c3b799..d90665487 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -5,43 +5,45 @@
 
 #if defined(DMALLOC)
 
-#include "dmalloc.h"
-
-#define aMalloc(size) \
-  dmalloc_malloc(__FILE__, __LINE__, (size), DMALLOC_FUNC_MALLOC, 0, 0)
-#define aMallocA(size) \
-  dmalloc_malloc(__FILE__, __LINE__, (size), DMALLOC_FUNC_MALLOC, 0, 0)
-#define aCallocA(count,size) \
-  dmalloc_malloc(__FILE__, __LINE__, (count)*(size), DMALLOC_FUNC_CALLOC, 0, 0)
-#define aCalloc(count,size) \
-  dmalloc_malloc(__FILE__, __LINE__, (count)*(size), DMALLOC_FUNC_CALLOC, 0, 0)
-#define aRealloc(ptr,size) \
-  dmalloc_realloc(__FILE__, __LINE__, (ptr), (size), DMALLOC_FUNC_REALLOC, 0)
-#define aFree(ptr) free(ptr)
-#define aStrdup(ptr) strdup(ptr)
+#	include "dmalloc.h"
+#	define aMalloc(size) \
+		dmalloc_malloc(__FILE__, __LINE__, (size), DMALLOC_FUNC_MALLOC, 0, 0)
+#	define aMallocA(size) \
+		dmalloc_malloc(__FILE__, __LINE__, (size), DMALLOC_FUNC_MALLOC, 0, 0)
+#	define aCallocA(count,size) \
+		dmalloc_malloc(__FILE__, __LINE__, (count)*(size), DMALLOC_FUNC_CALLOC, 0, 0)
+#	define aCalloc(count,size) \
+		dmalloc_malloc(__FILE__, __LINE__, (count)*(size), DMALLOC_FUNC_CALLOC, 0, 0)
+#	define aRealloc(ptr,size) \
+		dmalloc_realloc(__FILE__, __LINE__, (ptr), (size), DMALLOC_FUNC_REALLOC, 0)
+#	define aFree(ptr) free(ptr)
+#	define aStrdup(ptr) strdup(ptr)
 
 #elif defined(GCOLLECT)
-#include "gc.h"
-#define aMalloc(n) GC_MALLOC(n)
-#define aMallocA(n) GC_MALLOC_ATOMIC(n)
-#define aCallocA(m,n) _bcallocA(m,n)
-#define aCalloc(m,n) _bcalloc(m,n)
-#define aRealloc(p,n) GC_REALLOC(p,n)
-#define aFree(n) GC_FREE(n)
-#define aStrdup(n) _bstrdup(n)
 
-extern void * _bcalloc(size_t, size_t);
-extern void * _bcallocA(size_t, size_t);
-extern char * _bstrdup(const char *);
+#	include "gc.h"
+#	define aMalloc(n) GC_MALLOC(n)
+#	define aMallocA(n) GC_MALLOC_ATOMIC(n)
+#	define aCallocA(m,n) _bcallocA(m,n)
+#	define aCalloc(m,n) _bcalloc(m,n)
+#	define aRealloc(p,n) GC_REALLOC(p,n)
+#	define aFree(n) GC_FREE(n)
+#	define aStrdup(n) _bstrdup(n)
+
+	extern void * _bcalloc(size_t, size_t);
+	extern void * _bcallocA(size_t, size_t);
+	extern char * _bstrdup(const char *);
 
 #elif defined(BCHECK)
-#define aMalloc(n) malloc(n)
-#define aMallocA(n) malloc(n)
-#define aCalloc(m,n) calloc(m,n)
-#define aCallocA(m,n) calloc(m,n)
-#define aRealloc(p,n) realloc(p,n)
-#define aFree(n) free(n)
-#define aStrdup(n) strdup(n)
+
+#	define aMalloc(n) malloc(n)
+#	define aMallocA(n) malloc(n)
+#	define aCalloc(m,n) calloc(m,n)
+#	define aCallocA(m,n) calloc(m,n)
+#	define aRealloc(p,n) realloc(p,n)
+#	define aFree(n) free(n)
+#	define aStrdup(n) strdup(n)
+
 #else
 
 #if __STDC_VERSION__ < 199901L
@@ -52,19 +54,19 @@ extern char * _bstrdup(const char *);
 # endif
 #endif
 
-#define ALC_MARK __FILE__, __LINE__, __func__
+#	define ALC_MARK __FILE__, __LINE__, __func__
 
-void* aMalloc_( size_t size, const char *file, int line, const char *func );
-void* aCalloc_( size_t num, size_t size, const char *file, int line, const char *func );
-void* aRealloc_( void *p, size_t size, const char *file, int line, const char *func );
+	void* aMalloc_( size_t size, const char *file, int line, const char *func );
+	void* aCalloc_( size_t num, size_t size, const char *file, int line, const char *func );
+	void* aRealloc_( void *p, size_t size, const char *file, int line, const char *func );
 
-#define aMalloc(n) aMalloc_(n,ALC_MARK)
-#define aMallocA(n) aMalloc_(n,ALC_MARK)
-#define aCalloc(m,n) aCalloc_(m,n,ALC_MARK)
-#define aCallocA(m,n) aCalloc_(m,n,ALC_MARK)
-#define aRealloc(p,n) aRealloc_(p,n,ALC_MARK)
-#define aFree(ptr) free(ptr)
-#define aStrdup(ptr) strdup(ptr)
+#	define aMalloc(n) aMalloc_(n,ALC_MARK)
+#	define aMallocA(n) aMalloc_(n,ALC_MARK)
+#	define aCalloc(m,n) aCalloc_(m,n,ALC_MARK)
+#	define aCallocA(m,n) aCalloc_(m,n,ALC_MARK)
+#	define aRealloc(p,n) aRealloc_(p,n,ALC_MARK)
+#	define aFree(ptr) free(ptr)
+#	define aStrdup(ptr) strdup(ptr)
 
 #endif