From 769a27287fb09589a78faf70a9adbb2cb99bd3ac Mon Sep 17 00:00:00 2001 From: aleos89 Date: Tue, 10 Feb 2015 14:58:17 -0500 Subject: [PATCH] Follow up to 083cf5d - Fixed compile warnings. --- src/map/status.c | 6 ++---- src/map/status.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/map/status.c b/src/map/status.c index 4a79555e06e..b9209ae1209 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2156,9 +2156,9 @@ unsigned int status_weapon_atk(struct weapon_atk wa, struct status_data *status) unsigned short status_base_matk_max(const struct status_data* status) { return status->int_ + (status->int_ / 5) * (status->int_ / 5); } #endif +#ifdef RENEWAL unsigned short status_base_matk(struct block_list *bl, const struct status_data* status, int level) { -#ifdef RENEWAL switch (bl->type) { case BL_MOB: return status->int_ + level; @@ -2168,10 +2168,8 @@ unsigned short status_base_matk(struct block_list *bl, const struct status_data* default: return status->int_ + (status->int_ / 2) + (status->dex / 5) + (status->luk / 3) + (level / 4); } -#else - return 0; -#endif } +#endif /** * Fills in the misc data that can be calculated from the other status info (except for level) diff --git a/src/map/status.h b/src/map/status.h index b0242674f84..7b51e005f82 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -2060,10 +2060,10 @@ int status_change_spread( struct block_list *src, struct block_list *bl ); unsigned short status_base_matk_max(const struct status_data* status); #else unsigned int status_weapon_atk(struct weapon_atk wa, struct status_data *status); + unsigned short status_base_matk(struct block_list *bl, const struct status_data* status, int level); #endif unsigned short status_base_atk(const struct block_list *bl, const struct status_data *status); -unsigned short status_base_matk(struct block_list *bl, const struct status_data* status, int level); int status_readdb(void); int do_init_status(void);