diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-18 21:25:26 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-18 21:25:26 +0000 |
| commit | 2bc59ef9db7a86d0c483e3848ead57d6d691e6a3 (patch) | |
| tree | dfe7994053b5e2d0a1aad158ca23f0cc8e0bc533 /src/map/npc.c | |
| parent | ea3c690441b4f4c6cea3fd556ac0618018be9a23 (diff) | |
| download | hercules-2bc59ef9db7a86d0c483e3848ead57d6d691e6a3.tar.gz hercules-2bc59ef9db7a86d0c483e3848ead57d6d691e6a3.tar.bz2 hercules-2bc59ef9db7a86d0c483e3848ead57d6d691e6a3.tar.xz hercules-2bc59ef9db7a86d0c483e3848ead57d6d691e6a3.zip | |
Fixed numerous /W4 warnings (and created more :)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11514 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 622d67ec1..0c04cfb73 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -532,7 +532,7 @@ int npc_timerevent_stop(struct npc_data* nd) return 0; td = get_timer(*tid); if (td && td->data) - ers_free(timer_event_ers, (struct event_timer_data*)td->data); + ers_free(timer_event_ers, (void*)td->data); delete_timer(*tid,npc_timerevent); *tid = -1; //Set the timer tick to the time that has passed since the beginning of the timers and now. @@ -1316,7 +1316,7 @@ int npc_unload(struct npc_data* nd) struct TimerData *td = NULL; td = get_timer(nd->u.scr.timerid); if (td && td->data) - ers_free(timer_event_ers, (struct event_timer_data*)td->data); + ers_free(timer_event_ers, (void*)td->data); delete_timer(nd->u.scr.timerid, npc_timerevent); } if (nd->u.scr.timer_event) |