diff options
| author | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-14 15:29:00 +0000 |
|---|---|---|
| committer | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-14 15:29:00 +0000 |
| commit | 27abf1bcb19ef14ec08dc7916cd383e3f045c88b (patch) | |
| tree | a939536eb04ffe940f656d1f492f8d12083e39cc /src/map/npc.c | |
| parent | 4c1423ea04f98647576a952be6adbc1b0d8ce2cf (diff) | |
| download | hercules-27abf1bcb19ef14ec08dc7916cd383e3f045c88b.tar.gz hercules-27abf1bcb19ef14ec08dc7916cd383e3f045c88b.tar.bz2 hercules-27abf1bcb19ef14ec08dc7916cd383e3f045c88b.tar.xz hercules-27abf1bcb19ef14ec08dc7916cd383e3f045c88b.zip | |
Removed deprecated memory manager macros (follow-up to r14916).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15581 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index bfdc486cd..9a0eaa71f 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -458,7 +458,7 @@ int npc_timerevent_import(char* lname, void* data, va_list ap) int j, i = nd->u.scr.timeramount; if( te == NULL ) - te = (struct npc_timerevent_list*)aMallocA( sizeof(struct npc_timerevent_list) ); + te = (struct npc_timerevent_list*)aMalloc( sizeof(struct npc_timerevent_list) ); else te = (struct npc_timerevent_list*)aRealloc( te, sizeof(struct npc_timerevent_list) * (i+1) ); @@ -2180,7 +2180,7 @@ int npc_convertlabel_db(DBKey key, void* data, va_list ap) if( *label_list == NULL ) { - *label_list = (struct npc_label_list *) aCallocA (1, sizeof(struct npc_label_list)); + *label_list = (struct npc_label_list *) aCalloc (1, sizeof(struct npc_label_list)); *label_list_num = 0; } else *label_list = (struct npc_label_list *) aRealloc (*label_list, sizeof(struct npc_label_list)*(*label_list_num+1)); @@ -2391,7 +2391,7 @@ static const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, cons struct npc_timerevent_list *te = nd->u.scr.timer_event; int j, k = nd->u.scr.timeramount; if (te == NULL) - te = (struct npc_timerevent_list *)aMallocA(sizeof(struct npc_timerevent_list)); + te = (struct npc_timerevent_list *)aMalloc(sizeof(struct npc_timerevent_list)); else te = (struct npc_timerevent_list *)aRealloc( te, sizeof(struct npc_timerevent_list) * (k+1) ); for (j = 0; j < k; j++){ @@ -2579,7 +2579,7 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch struct npc_timerevent_list *te = nd->u.scr.timer_event; int j, k = nd->u.scr.timeramount; if (te == NULL) - te = (struct npc_timerevent_list *)aMallocA(sizeof(struct npc_timerevent_list)); + te = (struct npc_timerevent_list *)aMalloc(sizeof(struct npc_timerevent_list)); else te = (struct npc_timerevent_list *)aRealloc( te, sizeof(struct npc_timerevent_list) * (k+1) ); for (j = 0; j < k; j++){ |