diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-30 09:14:21 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-30 09:14:21 +0000 |
| commit | 09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf (patch) | |
| tree | 9971dee8e7148436dcb49af51bb820d764f10c21 /src/map/script.c | |
| parent | dd73c6ea546a8828653cdce38a52f575cbdd3b96 (diff) | |
| download | hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.gz hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.bz2 hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.xz hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.zip | |
Replaced custom type 'intptr' with standard 'intptr_t'.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14873 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c index 0511a410b..7b27581ae 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -3319,7 +3319,7 @@ struct linkdb_node* script_erase_sleepdb(struct linkdb_node *n) /*========================================== * sleep用タイマー関数 *------------------------------------------*/ -int run_script_timer(int tid, unsigned int tick, int id, intptr data) +int run_script_timer(int tid, unsigned int tick, int id, intptr_t data) { struct script_state *st = (struct script_state *)data; struct linkdb_node *node = (struct linkdb_node *)sleep_db; @@ -3516,7 +3516,7 @@ void run_script_main(struct script_state *st) sd = map_id2sd(st->rid); // Get sd since script might have attached someone while running. [Inkfish] st->sleep.charid = sd?sd->status.char_id:0; st->sleep.timer = add_timer(gettick()+st->sleep.tick, - run_script_timer, st->sleep.charid, (intptr)st); + run_script_timer, st->sleep.charid, (intptr_t)st); linkdb_insert(&sleep_db, (void*)st->oid, st); } else if(st->state != END && st->rid){ |