diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2017-10-21 22:08:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-21 22:08:28 -0400 |
| commit | 612758435e491a13ca20d89bcaea911d162ebae6 (patch) | |
| tree | 2c440feba0d381ede523d456a82772f6bccd51da | |
| parent | 4db32c22afe61ef510ae0df6142af6a4ce6a5a5f (diff) | |
| parent | 9a2a89b7503584d5009dcc9ca1f5aa0a17673130 (diff) | |
| download | hercules-612758435e491a13ca20d89bcaea911d162ebae6.tar.gz hercules-612758435e491a13ca20d89bcaea911d162ebae6.tar.bz2 hercules-612758435e491a13ca20d89bcaea911d162ebae6.tar.xz hercules-612758435e491a13ca20d89bcaea911d162ebae6.zip | |
Merge pull request #1870 from MishimaHaruna/msvc15
Fix various warnings on Visual Studio 2017
| -rw-r--r-- | src/map/atcommand.c | 18 | ||||
| -rw-r--r-- | src/map/pc.c | 18 |
2 files changed, 17 insertions, 19 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index a59748b9e..d9f4810ee 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -4868,21 +4868,19 @@ ACMD(undisguiseguild) *------------------------------------------*/ ACMD(exp) { - char output[CHAT_SIZE_MAX]; - double nextb, nextj; - - memset(output, '\0', sizeof(output)); + double percentb = 0.0, percentj = 0.0; + uint64 nextb, nextj; nextb = pc->nextbaseexp(sd); - if (nextb) - nextb = sd->status.base_exp*100.0/nextb; + if (nextb != 0) + percentb = sd->status.base_exp * 100.0 / nextb; nextj = pc->nextjobexp(sd); - if (nextj) - nextj = sd->status.job_exp*100.0/nextj; + if (nextj != 0) + percentj = sd->status.job_exp * 100.0 / nextj; - sprintf(output, msg_fd(fd,1148), sd->status.base_level, nextb, sd->status.job_level, nextj); // Base Level: %d (%.3f%%) | Job Level: %d (%.3f%%) - clif->message(fd, output); + sprintf(atcmd_output, msg_fd(fd,1148), sd->status.base_level, percentb, sd->status.job_level, percentj); // Base Level: %d (%.3f%%) | Job Level: %d (%.3f%%) + clif->message(fd, atcmd_output); return true; } diff --git a/src/map/pc.c b/src/map/pc.c index 760519298..0636ebafa 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -8332,7 +8332,7 @@ int pc_setparam(struct map_session_data *sd, int type, int64 val) if (val >= sd->status.job_level) { if (val > pc->maxjoblv(sd)) val = pc->maxjoblv(sd); - sd->status.skill_point += val - sd->status.job_level; + sd->status.skill_point += (int)val - sd->status.job_level; clif->updatestatus(sd, SP_SKILLPOINT); } sd->status.job_level = (int32)val; @@ -8413,28 +8413,28 @@ int pc_setparam(struct map_session_data *sd, int type, int64 val) } break; case SP_STR: - sd->status.str = cap_value(val, 1, pc_maxparameter(sd)); + sd->status.str = cap_value((int)val, 1, pc_maxparameter(sd)); break; case SP_AGI: - sd->status.agi = cap_value(val, 1, pc_maxparameter(sd)); + sd->status.agi = cap_value((int)val, 1, pc_maxparameter(sd)); break; case SP_VIT: - sd->status.vit = cap_value(val, 1, pc_maxparameter(sd)); + sd->status.vit = cap_value((int)val, 1, pc_maxparameter(sd)); break; case SP_INT: - sd->status.int_ = cap_value(val, 1, pc_maxparameter(sd)); + sd->status.int_ = cap_value((int)val, 1, pc_maxparameter(sd)); break; case SP_DEX: - sd->status.dex = cap_value(val, 1, pc_maxparameter(sd)); + sd->status.dex = cap_value((int)val, 1, pc_maxparameter(sd)); break; case SP_LUK: - sd->status.luk = cap_value(val, 1, pc_maxparameter(sd)); + sd->status.luk = cap_value((int)val, 1, pc_maxparameter(sd)); break; case SP_KARMA: - sd->status.karma = val; + sd->status.karma = (int)val; break; case SP_MANNER: - sd->status.manner = val; + sd->status.manner = (int)val; if( val < 0 ) sc_start(NULL, &sd->bl, SC_NOCHAT, 100, 0, 0); else { |