diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-11 16:04:24 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-11 16:04:24 +0000 |
| commit | ebf34f01ebc8d2c1e3af90c58c6be5b240efc01c (patch) | |
| tree | f773155526ba89186626de09faf7f2dcbe2bb1c9 /src/map/npc.c | |
| parent | 1ce32a605550e2e3418d2ba23948ecc832d7c76c (diff) | |
| download | hercules-ebf34f01ebc8d2c1e3af90c58c6be5b240efc01c.tar.gz hercules-ebf34f01ebc8d2c1e3af90c58c6be5b240efc01c.tar.bz2 hercules-ebf34f01ebc8d2c1e3af90c58c6be5b240efc01c.tar.xz hercules-ebf34f01ebc8d2c1e3af90c58c6be5b240efc01c.zip | |
- Spirit of Sin and Enchant Deadly Poison now stack.
- Fixed skill damage card bonuses not working on magic skills.
- Moved the setting of sd->npc_id = 0 in npc_dequeue to the beginning, since this function is called when a script is cancelled (TODO: but when this happens, shouldn't the previously ongoing script also be free'd?)
- Made homunc's speed be recalculated when you respawn it from rest state.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9453 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 46fd4c4ab..d322fc530 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -162,6 +162,7 @@ int npc_event_dequeue(struct map_session_data *sd) { nullpo_retr(0, sd); + sd->npc_id=0; if (!sd->eventqueue[0][0]) return 0; //Nothing to dequeue @@ -171,7 +172,6 @@ int npc_event_dequeue(struct map_session_data *sd) return 0; } //Event dequeued successfully, shift other elements. - sd->npc_id=0; //FIXME: Shouldn't dequeueing fail when you have an npc_id set? memmove(sd->eventqueue[0], sd->eventqueue[1], (MAX_EVENTQUEUE-1)*sizeof(sd->eventqueue[0])); sd->eventqueue[MAX_EVENTQUEUE-1][0]=0; return 1; |