diff options
| author | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-27 22:00:14 +0000 |
|---|---|---|
| committer | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-27 22:00:14 +0000 |
| commit | 793c5d77e23357c5880e1422c539e5e0cd581eb7 (patch) | |
| tree | 5a3e1403f9d17ba0f281db0eb93ce73372f0e4af /src/map/status.c | |
| parent | d94f37c22a4c7306c2e062183a94cfaaf8856006 (diff) | |
| download | hercules-793c5d77e23357c5880e1422c539e5e0cd581eb7.tar.gz hercules-793c5d77e23357c5880e1422c539e5e0cd581eb7.tar.bz2 hercules-793c5d77e23357c5880e1422c539e5e0cd581eb7.tar.xz hercules-793c5d77e23357c5880e1422c539e5e0cd581eb7.zip | |
* Fixed bugreport:7052, npcs with monster sprite now work.
* Follow up to r17052, now it properly resets the x and y coordinate for every npc and checks it after the map.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17053 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c index 7047906e1..df30516ca 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5805,7 +5805,7 @@ struct status_data *status_get_status_data(struct block_list *bl) case BL_HOM: return &((TBL_HOM*)bl)->battle_status; case BL_MER: return &((TBL_MER*)bl)->battle_status; case BL_ELEM: return &((TBL_ELEM*)bl)->battle_status; - case BL_NPC: return &((TBL_NPC*)bl)->status; + case BL_NPC: return ((mobdb_checkid(((TBL_NPC*)bl)->class_) == 0) ? &((TBL_NPC*)bl)->status : &dummy_status); default: return &dummy_status; } @@ -5821,7 +5821,7 @@ struct status_data *status_get_base_status(struct block_list *bl) case BL_HOM: return &((TBL_HOM*)bl)->base_status; case BL_MER: return &((TBL_MER*)bl)->base_status; case BL_ELEM: return &((TBL_ELEM*)bl)->base_status; - case BL_NPC: return &((TBL_NPC*)bl)->status; + case BL_NPC: return ((mobdb_checkid(((TBL_NPC*)bl)->class_) == 0) ? &((TBL_NPC*)bl)->status : NULL); default: return NULL; } |