summaryrefslogtreecommitdiff
path: root/src/map/map.c
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-27 16:29:44 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-27 16:29:44 +0000
commitb14ce328eaf0c82dff32ba156ec440ff1a07ac0d (patch)
tree2da3e570dda7049d4cca85c5b43e1c02577997bc /src/map/map.c
parent99b156f4ec91f2d52fd57aa1710ae9261b8db356 (diff)
downloadhercules-b14ce328eaf0c82dff32ba156ec440ff1a07ac0d.tar.gz
hercules-b14ce328eaf0c82dff32ba156ec440ff1a07ac0d.tar.bz2
hercules-b14ce328eaf0c82dff32ba156ec440ff1a07ac0d.tar.xz
hercules-b14ce328eaf0c82dff32ba156ec440ff1a07ac0d.zip
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@821 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
-rw-r--r--src/map/map.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/map/map.c b/src/map/map.c
index d89bf424d..91f82110f 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1769,7 +1769,7 @@ static int map_readafm(int m,char *fn) {
map[m].m = m;
xs = map[m].xs = afm_size[0];
ys = map[m].ys = afm_size[1];
- map[m].gat = calloc(s = map[m].xs * map[m].ys, 1);
+ map[m].gat = aCalloc(s = map[m].xs * map[m].ys, 1);
if(map[m].gat==NULL){
printf("out of memory : map_readmap gat\n");
@@ -1792,14 +1792,14 @@ static int map_readafm(int m,char *fn) {
map[m].bxs=(xs+BLOCK_SIZE-1)/BLOCK_SIZE;
map[m].bys=(ys+BLOCK_SIZE-1)/BLOCK_SIZE;
size = map[m].bxs * map[m].bys * sizeof(struct block_list*);
- map[m].block = calloc(size, 1);
+ map[m].block = aCalloc(size, 1);
if(map[m].block == NULL){
printf("out of memory : map_readmap block\n");
exit(1);
}
- map[m].block_mob = calloc(size, 1);
+ map[m].block_mob = aCalloc(size, 1);
if (map[m].block_mob == NULL) {
printf("out of memory : map_readmap block_mob\n");
exit(1);
@@ -1807,14 +1807,14 @@ static int map_readafm(int m,char *fn) {
size = map[m].bxs*map[m].bys*sizeof(int);
- map[m].block_count = calloc(size, 1);
+ map[m].block_count = aCalloc(size, 1);
if(map[m].block_count==NULL){
printf("out of memory : map_readmap block\n");
exit(1);
}
memset(map[m].block_count,0,size);
- map[m].block_mob_count=calloc(size, 1);
+ map[m].block_mob_count=aCalloc(size, 1);
if(map[m].block_mob_count==NULL){
printf("out of memory : map_readmap block_mob\n");
exit(1);
@@ -2067,15 +2067,15 @@ int parse_console(char *buf) {
int m, n;
struct map_session_data *sd;
- sd = calloc(sizeof(*sd), 1);
+ sd = aCalloc(sizeof(*sd), 1);
sd->fd = 0;
strcpy( sd->status.name , "console");
- type = (char *)malloc(64);
- command = (char *)malloc(64);
- map = (char *)malloc(64);
- buf2 = (char *)malloc(72);
+ type = (char *)aMalloc(64);
+ command = (char *)aMalloc(64);
+ map = (char *)aMalloc(64);
+ buf2 = (char *)aMalloc(72);
memset(type,0,64);
memset(command,0,64);