diff options
| author | Haru <haru@dotalux.com> | 2016-04-27 01:40:19 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-04-27 01:40:19 +0200 |
| commit | cd86cccaefd4ecd13c68d95d7967f0d8f4f890ff (patch) | |
| tree | dd8abdcbeee553c56feb62c23fa56f7cf0be009a /src/map/npc.c | |
| parent | 9b7f03b129503362c6349e0c0f7f42637df32ab5 (diff) | |
| parent | 1906d3327c586b72c6989f9ba4a7b95b25dc6341 (diff) | |
| download | hercules-cd86cccaefd4ecd13c68d95d7967f0d8f4f890ff.tar.gz hercules-cd86cccaefd4ecd13c68d95d7967f0d8f4f890ff.tar.bz2 hercules-cd86cccaefd4ecd13c68d95d7967f0d8f4f890ff.tar.xz hercules-cd86cccaefd4ecd13c68d95d7967f0d8f4f890ff.zip | |
Merge pull request #1269 from 4144/timersfix
Fix one of timer issue and add protection agains future issues like this
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 1b784b0c8..86e9e5e7a 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -4965,14 +4965,8 @@ static void npc_debug_warps(void) { int do_init_npc(bool minimal) { int i; - memset(&npc->base_ud, 0, sizeof( struct unit_data) ); - npc->base_ud.bl = NULL; - npc->base_ud.walktimer = INVALID_TIMER; - npc->base_ud.skilltimer = INVALID_TIMER; - npc->base_ud.attacktimer = INVALID_TIMER; - npc->base_ud.attackabletime = - npc->base_ud.canact_tick = - npc->base_ud.canmove_tick = timer->gettick(); + unit->init_ud(&npc->base_ud); + npc->base_ud.bl = NULL; //Stock view data for normal npcs. memset(&npc_viewdb, 0, sizeof(npc_viewdb)); |