diff options
| author | Haru <haru@dotalux.com> | 2016-02-20 15:59:58 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-02-20 15:59:58 +0100 |
| commit | 71968e6985a2d6798505b84bc7ed22f5c6bfcfac (patch) | |
| tree | 4740ae636d410980f379cc4bb3a969b49451c7c7 /src/map/battleground.c | |
| parent | 5b74faa8afd04771af7acb918072ea71a3db475f (diff) | |
| parent | b7f772294594c40ef1e18f9c044e5c4fe6b490f4 (diff) | |
| download | hercules-71968e6985a2d6798505b84bc7ed22f5c6bfcfac.tar.gz hercules-71968e6985a2d6798505b84bc7ed22f5c6bfcfac.tar.bz2 hercules-71968e6985a2d6798505b84bc7ed22f5c6bfcfac.tar.xz hercules-71968e6985a2d6798505b84bc7ed22f5c6bfcfac.zip | |
Merge pull request #1162 from 4144/flags
Add some compiler warning flags and fix new warnings
Diffstat (limited to 'src/map/battleground.c')
| -rw-r--r-- | src/map/battleground.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/map/battleground.c b/src/map/battleground.c index d25aef851..311690ec3 100644 --- a/src/map/battleground.c +++ b/src/map/battleground.c @@ -495,7 +495,8 @@ void bg_config_read(void) { } libconfig->destroy(&bg_conf); } -struct bg_arena *bg_name2arena (char *name) { +struct bg_arena *bg_name2arena(const char *name) +{ int i; nullpo_retr(NULL, name); for(i = 0; i < bg->arenas; i++) { @@ -827,9 +828,9 @@ enum BATTLEGROUNDS_QUEUE_ACK bg_canqueue(struct map_session_data *sd, struct bg_ if ( ( tick = pc_readglobalreg(sd, script->add_str(bg->gdelay_var)) ) && tsec < tick ) { char response[100]; if( (tick-tsec) > 60 ) - sprintf(response, "You are a deserter! Wait %d minute(s) before you can apply again",(tick-tsec)/60); + sprintf(response, "You are a deserter! Wait %u minute(s) before you can apply again", (tick - tsec) / 60); else - sprintf(response, "You are a deserter! Wait %d seconds before you can apply again",(tick-tsec)); + sprintf(response, "You are a deserter! Wait %u seconds before you can apply again", (tick - tsec)); clif->messagecolor_self(sd->fd, COLOR_RED, response); return BGQA_FAIL_DESERTER; } @@ -837,9 +838,9 @@ enum BATTLEGROUNDS_QUEUE_ACK bg_canqueue(struct map_session_data *sd, struct bg_ if ( ( tick = pc_readglobalreg(sd, script->add_str(arena->delay_var)) ) && tsec < tick ) { char response[100]; if( (tick-tsec) > 60 ) - sprintf(response, "You can't reapply to this arena so fast. Apply to the different arena or wait %d minute(s)",(tick-tsec)/60); + sprintf(response, "You can't reapply to this arena so fast. Apply to the different arena or wait %u minute(s)", (tick - tsec) / 60); else - sprintf(response, "You can't reapply to this arena so fast. Apply to the different arena or wait %d seconds",(tick-tsec)); + sprintf(response, "You can't reapply to this arena so fast. Apply to the different arena or wait %u seconds", (tick - tsec)); clif->messagecolor_self(sd->fd, COLOR_RED, response); return BGQA_FAIL_COOLDOWN; } @@ -906,7 +907,7 @@ enum BATTLEGROUNDS_QUEUE_ACK bg_canqueue(struct map_session_data *sd, struct bg_ case BGQT_INDIVIDUAL:/* already did */ break; default: - ShowDebug("bg_canqueue: unknown/unsupported type %d\n",type); + ShowDebug("bg_canqueue: unknown/unsupported type %u\n", type); return BGQA_DUPLICATE_REQUEST; } return BGQA_SUCCESS; |