diff options
| author | Haru <haru@dotalux.com> | 2016-11-15 01:07:35 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-11-20 18:10:34 +0100 |
| commit | 0f1d29091b3397a790b39ef5fa87555b1e8eee87 (patch) | |
| tree | 9ab7eac07bc41c327063f227e01e1a2522d7653b /src/map/pc.c | |
| parent | 28c710b1762cefd59285d340b996048287978141 (diff) | |
| download | hercules-0f1d29091b3397a790b39ef5fa87555b1e8eee87.tar.gz hercules-0f1d29091b3397a790b39ef5fa87555b1e8eee87.tar.bz2 hercules-0f1d29091b3397a790b39ef5fa87555b1e8eee87.tar.xz hercules-0f1d29091b3397a790b39ef5fa87555b1e8eee87.zip | |
Synchronized the AegisNames to the in-source ITEMID_ constants
Some missing items were copied to the pre-renewal database. In general,
when an item ID is hardcoded in source, it's preferable that the item
exists in both databases.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index bfd6c0ea5..674eeb90f 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -490,7 +490,7 @@ void pc_rental_expire(struct map_session_data *sd, int i) { /* Soon to be dropped, we got plans to integrate it with item db */ switch( nameid ) { - case ITEMID_REINS_OF_MOUNT: + case ITEMID_BOARDING_HALTER: status_change_end(&sd->bl,SC_ALL_RIDING,INVALID_TIMER); break; case ITEMID_LOVE_ANGEL: @@ -4977,7 +4977,7 @@ int pc_useitem(struct map_session_data *sd,int n) { return 0; /* Items with delayed consume are not meant to work while in mounts except reins of mount(12622) */ - if( sd->inventory_data[n]->flag.delay_consume && nameid != ITEMID_REINS_OF_MOUNT ) { + if (sd->inventory_data[n]->flag.delay_consume && nameid != ITEMID_BOARDING_HALTER) { if( sd->sc.data[SC_ALL_RIDING] ) return 0; else if( pc_issit(sd) ) @@ -5004,7 +5004,7 @@ int pc_useitem(struct map_session_data *sd,int n) { } else {// not yet used item (all slots are initially empty) sd->item_delay[i].nameid = nameid; } - if (!(nameid == ITEMID_REINS_OF_MOUNT && pc_hasmount(sd))) + if (!(nameid == ITEMID_BOARDING_HALTER && pc_hasmount(sd))) sd->item_delay[i].tick = tick + sd->inventory_data[n]->delay; } else {// should not happen ShowError("pc_useitem: Exceeded item delay array capacity! (nameid=%d, char_id=%d)\n", nameid, sd->status.char_id); @@ -11674,9 +11674,9 @@ bool pc_db_checkid(unsigned int class_) int pc_have_magnifier(struct map_session_data *sd) { int n; - n = pc->search_inventory(sd, ITEMID_MAGNIFIER); + n = pc->search_inventory(sd, ITEMID_SPECTACLES); if (n == INDEX_NOT_FOUND) - n = pc->search_inventory(sd, ITEMID_NOVICE_MAGNIFIER); + n = pc->search_inventory(sd, ITEMID_N_MAGNIFIER); return n; } |