diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-07 16:49:03 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-07 16:49:03 +0000 |
| commit | b795233e374987f4c427f59922f271810f937eef (patch) | |
| tree | 047fafbeb99c4b12bcaadf046854af54e85dcad0 /src/map/map.c | |
| parent | f4a6909849243c3e4776ddee4de962224e80ac9a (diff) | |
| download | hercules-b795233e374987f4c427f59922f271810f937eef.tar.gz hercules-b795233e374987f4c427f59922f271810f937eef.tar.bz2 hercules-b795233e374987f4c427f59922f271810f937eef.tar.xz hercules-b795233e374987f4c427f59922f271810f937eef.zip | |
Undid the memset->malloc_set replacement
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9626 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/map.c b/src/map/map.c index d580dd09c..f17b05e02 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2570,7 +2570,7 @@ static int map_cache_open(char *fn) // 読み甲ﾝに失敗したので新規に作成する map_cache.fp = fopen(fn,"wb"); if(map_cache.fp) { - malloc_set(&map_cache.head,0,sizeof(struct map_cache_head)); + memset(&map_cache.head,0,sizeof(struct map_cache_head)); map_cache.map = (struct map_cache_info *) aCalloc(sizeof(struct map_cache_info),MAX_MAP_CACHE); map_cache.head.nmaps = MAX_MAP_CACHE; map_cache.head.sizeof_header = sizeof(struct map_cache_head); @@ -3135,7 +3135,7 @@ int map_readallmaps (void) // pre-init some data map[i].alias = NULL; map[i].m = i; - malloc_set (map[i].moblist, 0, sizeof(map[i].moblist)); //Initialize moblist [Skotlex] + memset (map[i].moblist, 0, sizeof(map[i].moblist)); //Initialize moblist [Skotlex] map[i].mob_delete_timer = -1; //Initialize timer [Skotlex] if (battle_config.pk_mode) map[i].flag.pvp = 1; // make all maps pvp for pk_mode [Valaris] @@ -3253,7 +3253,7 @@ int parse_console(char *buf) { int m, n; struct map_session_data sd; - malloc_set(&sd, 0, sizeof(struct map_session_data)); + memset(&sd, 0, sizeof(struct map_session_data)); strcpy( sd.status.name , "console"); if ( ( n = sscanf(buf, "%[^:]:%[^:]:%99s %d %d[^\n]", type , command , map , &x , &y )) < 5 ) |