diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-11-22 15:44:17 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-11-22 15:44:17 +0000 |
| commit | 951a736ea97701dcde48c6085a596de96bafce45 (patch) | |
| tree | 4aa30fc79780452937ea476e68b1a3013bc9c57c /src/map/npc.c | |
| parent | 82ed8e76484c53edb394191d95da9d1fad77bbe1 (diff) | |
| download | hercules-951a736ea97701dcde48c6085a596de96bafce45.tar.gz hercules-951a736ea97701dcde48c6085a596de96bafce45.tar.bz2 hercules-951a736ea97701dcde48c6085a596de96bafce45.tar.xz hercules-951a736ea97701dcde48c6085a596de96bafce45.zip | |
* Hunted down the simpler 64bit pointer truncations.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13380 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 592bd88f1..a347cd128 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -434,9 +434,9 @@ int npc_timerevent(int tid, unsigned int tick, int id, intptr data) - nd->u.scr.timer_event[ ted->next-1 ].timer; ted->time+=next; if (sd) - sd->npc_timer_id = add_timer(tick+next,npc_timerevent,id,(int)ted); + sd->npc_timer_id = add_timer(tick+next,npc_timerevent,id,(intptr)ted); else - nd->u.scr.timerid = add_timer(tick+next,npc_timerevent,id,(int)ted); + nd->u.scr.timerid = add_timer(tick+next,npc_timerevent,id,(intptr)ted); } else { if (sd) sd->npc_timer_id = -1; @@ -500,9 +500,9 @@ int npc_timerevent_start(struct npc_data* nd, int rid) next = nd->u.scr.timer_event[j].timer - nd->u.scr.timer; ted->time = nd->u.scr.timer_event[j].timer; if (sd) - sd->npc_timer_id = add_timer(gettick()+next,npc_timerevent,nd->bl.id,(int)ted); + sd->npc_timer_id = add_timer(gettick()+next,npc_timerevent,nd->bl.id,(intptr)ted); else - nd->u.scr.timerid = add_timer(gettick()+next,npc_timerevent,nd->bl.id,(int)ted); + nd->u.scr.timerid = add_timer(gettick()+next,npc_timerevent,nd->bl.id,(intptr)ted); return 0; } /*========================================== |