Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow up to ce7aacb

Browse Source 
* Fixed some compile errors/warnings reported in Travis.
This commit is contained in:
aleos89 2015-10-19 14:43:48 -04:00
parent ce7aacb9a4
commit 66fbcfe49c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/atcommand.c
View File

@ -2506,7 +2506,7 @@ ACMD_FUNC(param)
uint8 i; uint8 i;
int value = 0; int value = 0;
const char* param[] = { "str", "agi", "vit", "int", "dex", "luk" }; const char* param[] = { "str", "agi", "vit", "int", "dex", "luk" };
short new_value, *status[6], max_status[6]; unsigned short new_value, *status[6], max_status[6];
//we don't use direct initialization because it isn't part of the c standard. //we don't use direct initialization because it isn't part of the c standard.
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
@ -2573,7 +2573,7 @@ ACMD_FUNC(stat_all)
{ {
int value = 0; int value = 0;
uint8 count, i; uint8 count, i;
short *status[PARAM_MAX], max_status[PARAM_MAX]; unsigned short *status[PARAM_MAX], max_status[PARAM_MAX];
//we don't use direct initialization because it isn't part of the c standard. //we don't use direct initialization because it isn't part of the c standard.
nullpo_retr(-1, sd); nullpo_retr(-1, sd);

16
src/map/status.c
View File

@ -2955,7 +2955,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
{ {
static int calculating = 0; ///< Check for recursive call preemption. [Skotlex] static int calculating = 0; ///< Check for recursive call preemption. [Skotlex]
struct status_data *base_status; ///< Pointer to the player's base status struct status_data *base_status; ///< Pointer to the player's base status
short bStr, bAgi, bVit, bInt_, bDex, bLuk; ///< Stat addition to the player's base status short bStr = 0, bAgi = 0, bVit = 0, bInt_ = 0, bDex = 0, bLuk = 0; ///< Stat addition to the player's base status
const struct status_change *sc = &sd->sc; const struct status_change *sc = &sd->sc;
struct s_skill b_skill[MAX_SKILL]; ///< Previous skill tree struct s_skill b_skill[MAX_SKILL]; ///< Previous skill tree
int b_weight, b_max_weight, b_cart_weight_max, ///< Previous weight int b_weight, b_max_weight, b_cart_weight_max, ///< Previous weight
@ -3378,7 +3378,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
continue; continue;
switch(job_info[index].job_bonus[i]) { switch(job_info[index].job_bonus[i]) {
case 1: bStr++; break; case 1: bStr++; break;
case 2: bagi++; break; case 2: bAgi++; break;
case 3: bVit++; break; case 3: bVit++; break;
case 4: bInt_++; break; case 4: bInt_++; break;
case 5: bDex++; break; case 5: bDex++; break;
@ -3773,12 +3773,12 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
status_cpy(&sd->battle_status, base_status); status_cpy(&sd->battle_status, base_status);
// Add to Battle Stats after copy // Add to Battle Stats after copy
sd->battle_status->str += bStr; sd->battle_status.str += bStr;
sd->battle_status->agi += bAgi; sd->battle_status.agi += bAgi;
sd->battle_status->vit += bVit; sd->battle_status.vit += bVit;
sd->battle_status->int_ += bInt_; sd->battle_status.int_ += bInt_;
sd->battle_status->dex += bDex; sd->battle_status.dex += bDex;
sd->battle_status->luk += bLuk; sd->battle_status.luk += bLuk;
// ----- CLIENT-SIDE REFRESH ----- // ----- CLIENT-SIDE REFRESH -----
if(!sd->bl.prev) { if(!sd->bl.prev) {