Skip to content

Commit

Permalink
Follow up to 083cf5d
Browse files Browse the repository at this point in the history 
- Fixed compile warnings.
  • Loading branch information
@aleos89
aleos89 committed Feb 10, 2015
1 parent 083cf5d commit 769a272
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions src/map/status.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/map/status.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

4 comments on commit 769a272

@RadianFord
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @aleos89 👍

@RadianFord
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Im still getting the warning message on this

status.c:5482: warning: ‘status_calc_matk’ defined but not used

static unsigned short status_calc_matk(struct block_list *bl, struct status_change *sc, int matk)

@aleos89
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eh, sorry about that. :\ Fixed in 831dcc2. I thought you were referring to another function.

@RadianFord
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aleos89 Sorry to confused you. but it's fixed thank you so much.

Please sign in to comment.