diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-01 17:17:09 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-01 17:17:09 +0000 |
| commit | 61248161ad0386b46d3f37ed4457366841501036 (patch) | |
| tree | 2b7e762eeda38166316d2e7cc8018509831d9475 /src/map/script.c | |
| parent | 22746a0a0a9efe5fc7e84496f5780116c52f2abe (diff) | |
| download | hercules-61248161ad0386b46d3f37ed4457366841501036.tar.gz hercules-61248161ad0386b46d3f37ed4457366841501036.tar.bz2 hercules-61248161ad0386b46d3f37ed4457366841501036.tar.xz hercules-61248161ad0386b46d3f37ed4457366841501036.zip | |
- Fixed txt-converter compilation.
- Added my_global.h include to login converter
- Removed sd->char_id since we can use sd->status.char_id instead.
- Small speedup in STRECOVERY, and made it not unlock a mob's target.
- Fixed GS_GROUNDDRIFT consuming ammo when it's time expires (so it was consuming 2 grenades instead of one). Also added a "explosion effect" when their time runs out.
- gvg_dungeon mapflag won't set pvp related mapflags anymore, pc_dead will force pvp ranking gain/loss on gvg_dungeon maps now.
- Now when coming out of hiding land-effects will trigger on the character.
- Made the pc_setpos message when being placed on an unwalkable tile tell you which player triggered it.
- Fixed land effects not taking effect inmediately on map-load when the invincible timer is disabled.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9374 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/script.c b/src/map/script.c index 79d3068eb..fee8efa5d 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -2574,7 +2574,7 @@ int run_script_timer(int tid, unsigned int tick, int id, int data) struct linkdb_node *node = (struct linkdb_node *)sleep_db; struct map_session_data *sd = map_id2sd(st->rid); - if((sd && sd->char_id != id) || (st->rid && !sd)) + if((sd && sd->status.char_id != id) || (st->rid && !sd)) { //Character mismatch. Cancel execution. st->rid = 0; st->state = END; @@ -2722,7 +2722,7 @@ void run_script_main(struct script_state *st) if(st->sleep.tick > 0) { //Delay execution - st->sleep.charid = sd?sd->char_id:0; + st->sleep.charid = sd?sd->status.char_id:0; st->sleep.timer = add_timer(gettick()+st->sleep.tick, run_script_timer, st->sleep.charid, (int)st); linkdb_insert(&sleep_db, (void*)st->oid, st); @@ -6184,7 +6184,7 @@ int buildin_successrefitem(struct script_state *st) clif_misceffect(&sd->bl,3); if(sd->status.inventory[i].refine == MAX_REFINE && sd->status.inventory[i].card[0] == CARD0_FORGE && - sd->char_id == MakeDWord(sd->status.inventory[i].card[2],sd->status.inventory[i].card[3]) + sd->status.char_id == MakeDWord(sd->status.inventory[i].card[2],sd->status.inventory[i].card[3]) ){ // Fame point system [DracoRPG] switch (sd->inventory_data[i]->wlv){ case 1: @@ -12480,7 +12480,7 @@ int buildin_awake(struct script_state *st) node = node->next; continue; } - if((sd && sd->char_id != tst->sleep.charid) || (tst->rid && !sd)) + if((sd && sd->status.char_id != tst->sleep.charid) || (tst->rid && !sd)) { //Cancel Execution tst->state=END; tst->rid = 0; |