diff options
| author | Dennis Friis <peavey@inspircd.org> | 2009-06-23 00:22:39 +0200 |
|---|---|---|
| committer | Dennis Friis <peavey@inspircd.org> | 2009-06-25 01:13:20 +0200 |
| commit | 4b825f68fa8e8ec86d6aa1694f629ed348fe50f1 (patch) | |
| tree | 54c4567fb51f8b1edb2cde224ea2ef6e7d994053 /src/common | |
| parent | 353fd0ec49222512a4292fb1452c2c82c8e3a38d (diff) | |
| download | tmwa-4b825f68fa8e8ec86d6aa1694f629ed348fe50f1.tar.gz tmwa-4b825f68fa8e8ec86d6aa1694f629ed348fe50f1.tar.bz2 tmwa-4b825f68fa8e8ec86d6aa1694f629ed348fe50f1.tar.xz tmwa-4b825f68fa8e8ec86d6aa1694f629ed348fe50f1.zip | |
Redo storage, derived from ea stable.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/malloc.h | 10 | ||||
| -rw-r--r-- | src/common/mmo.h | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/common/malloc.h b/src/common/malloc.h index 3733a5e..da16f06 100644 --- a/src/common/malloc.h +++ b/src/common/malloc.h @@ -13,13 +13,17 @@ #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, const char *, int, const char *); +void* aCalloc_ (size_t, size_t, const char *, int, const char *); +void* aRealloc_ (void *, size_t, const char *, int, const char *); #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 aStrdup(p) aStrdup_(p,ALC_MARK) +#define aFree(p) aFree_(p,ALC_MARK) #endif diff --git a/src/common/mmo.h b/src/common/mmo.h index 377f0b8..40904d7 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -128,17 +128,19 @@ struct mmo_charstatus { }; struct storage { + int dirty; int account_id; short storage_status; short storage_amount; - struct item storage[MAX_STORAGE]; + struct item storage_[MAX_STORAGE]; }; struct guild_storage { + int dirty; int guild_id; short storage_status; short storage_amount; - struct item storage[MAX_GUILD_STORAGE]; + struct item storage_[MAX_GUILD_STORAGE]; }; struct map_session_data; |