diff options
| author | Dastgir <dastgirpojee@rocketmail.com> | 2015-04-14 17:38:54 +0530 |
|---|---|---|
| committer | Dastgir <dastgirpojee@rocketmail.com> | 2015-04-14 17:38:54 +0530 |
| commit | dcee21a1a11c0c6aa5fe884f46bf3022375df3d1 (patch) | |
| tree | da986648a3fe09807c876be708d5efc5050a5d78 | |
| parent | 2961ebba3a7112c1422c63bd6e5c159cfafd07b0 (diff) | |
| parent | 37d2e16557b1cd9ee755e2792e20ad629d3fcef9 (diff) | |
| download | hercules-dcee21a1a11c0c6aa5fe884f46bf3022375df3d1.tar.gz hercules-dcee21a1a11c0c6aa5fe884f46bf3022375df3d1.tar.bz2 hercules-dcee21a1a11c0c6aa5fe884f46bf3022375df3d1.tar.xz hercules-dcee21a1a11c0c6aa5fe884f46bf3022375df3d1.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
| -rw-r--r-- | src/char/int_quest.c | 5 | ||||
| -rw-r--r-- | src/map/status.c | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/char/int_quest.c b/src/char/int_quest.c index 1d64f48a3..036229edd 100644 --- a/src/char/int_quest.c +++ b/src/char/int_quest.c @@ -246,14 +246,15 @@ int mapif_parse_quest_save(int fd) void mapif_send_quests(int fd, int char_id, struct quest *tmp_questlog, int num_quests) { - nullpo_retv(tmp_questlog); WFIFOHEAD(fd,num_quests*sizeof(struct quest)+8); WFIFOW(fd,0) = 0x3860; WFIFOW(fd,2) = num_quests*sizeof(struct quest)+8; WFIFOL(fd,4) = char_id; - if (num_quests > 0) + if (num_quests > 0) { + nullpo_retv(tmp_questlog); memcpy(WFIFOP(fd,8), tmp_questlog, sizeof(struct quest)*num_quests); + } WFIFOSET(fd,num_quests*sizeof(struct quest)+8); } diff --git a/src/map/status.c b/src/map/status.c index 4e4398c49..91ab19558 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4014,11 +4014,11 @@ int status_base_amotion_pc(struct map_session_data *sd, struct status_data *st) // raw delay adjustment from bAspd bonus amotion += sd->bonus.aspd_add; -#endif /* angra manyu disregards aspd_base and similar */ if ( sd->equip_index[EQI_HAND_R] >= 0 && sd->status.inventory[sd->equip_index[EQI_HAND_R]].nameid == ITEMID_ANGRA_MANYU ) return 0; +#endif return amotion; } @@ -4563,6 +4563,9 @@ unsigned short status_calc_batk(struct block_list *bl, struct status_change *sc, #ifndef RENEWAL if(sc->data[SC_LKCONCENTRATION]) batk += batk * sc->data[SC_LKCONCENTRATION]->val2/100; +#else + if ( sc->data[SC_NOEQUIPWEAPON] && bl->type != BL_PC ) + batk -= batk * sc->data[SC_NOEQUIPWEAPON]->val2 / 100; #endif if(sc->data[SC_SKE]) batk += batk * 3; @@ -4642,7 +4645,7 @@ unsigned short status_calc_watk(struct block_list *bl, struct status_change *sc, if(sc->data[SC_LKCONCENTRATION]) watk += watk * sc->data[SC_LKCONCENTRATION]->val2/100; #endif - if(sc->data[SC_INCATKRATE]) + if(sc->data[SC_INCATKRATE] && bl->type != BL_MOB) watk += watk * sc->data[SC_INCATKRATE]->val1/100; if(sc->data[SC_PROVOKE]) watk += watk * sc->data[SC_PROVOKE]->val3/100; @@ -4652,8 +4655,10 @@ unsigned short status_calc_watk(struct block_list *bl, struct status_change *sc, watk += watk * sc->data[SC_HLIF_FLEET]->val3/100; if(sc->data[SC_CURSE]) watk -= watk * 25/100; +#ifndef RENEWAL if(sc->data[SC_NOEQUIPWEAPON] && bl->type != BL_PC) watk -= watk * sc->data[SC_NOEQUIPWEAPON]->val2/100; +#endif if(sc->data[SC__ENERVATION]) watk -= watk * sc->data[SC__ENERVATION]->val2 / 100; if(sc->data[SC_RUSH_WINDMILL]) |