summaryrefslogtreecommitdiff
path: root/src/common/timer.c
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-07 16:49:03 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-07 16:49:03 +0000
commitb795233e374987f4c427f59922f271810f937eef (patch)
tree047fafbeb99c4b12bcaadf046854af54e85dcad0 /src/common/timer.c
parentf4a6909849243c3e4776ddee4de962224e80ac9a (diff)
downloadhercules-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/common/timer.c')
-rw-r--r--src/common/timer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/timer.c b/src/common/timer.c
index 3b4fb1db4..c7be0ab8f 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -153,7 +153,7 @@ static void push_timer_heap(int tid)
} else {
timer_heap_max += 256;
RECREATE(timer_heap, int, timer_heap_max);
- malloc_tsetdword(timer_heap + (timer_heap_max - 256), 0, sizeof(int) * 256);
+ memset(timer_heap + (timer_heap_max - 256), 0, sizeof(int) * 256);
}
}
@@ -223,7 +223,7 @@ static int acquire_timer(void)
{// add more timers
timer_data_max += 256;
RECREATE(timer_data, struct TimerData, timer_data_max);
- malloc_tsetdword(timer_data + (timer_data_max - 256), 0, sizeof(struct TimerData) * 256);
+ memset(timer_data + (timer_data_max - 256), 0, sizeof(struct TimerData) * 256);
}
}
@@ -412,7 +412,7 @@ int do_timer(unsigned int tick)
if (free_timer_list_pos >= free_timer_list_max) {
free_timer_list_max += 256;
RECREATE(free_timer_list,int,free_timer_list_max);
- malloc_tsetdword(free_timer_list + (free_timer_list_max - 256), 0, 256 * sizeof(int));
+ memset(free_timer_list + (free_timer_list_max - 256), 0, 256 * sizeof(int));
}
free_timer_list[free_timer_list_pos++] = i;
break;