80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

format stage ids more consistently

Browse source
This commit is contained in:
Andrei Alexeyev 2017-12-31 10:08:07 +02:00
parent 14e750fde0
commit ddc15eafc7
No known key found for this signature in database
GPG key ID: 363707CD4C7FE8A4
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cli.c
View file

@ -166,7 +166,7 @@ int cli_args(int argc, char **argv, CLIAction *a) {
if(a->type != CLI_PlayReplay && a->type != CLI_SelectStage) {
log_warn("--sid was ignored");
} else if(!stage_get(stageid)) {
log_fatal("Invalid stage id: %x", stageid);
log_fatal("Invalid stage id: %X", stageid);
}
}

4
src/main.c
View file

@ -193,7 +193,7 @@ int main(int argc, char **argv) {
if(a.type == CLI_DumpStages) {
for(StageInfo *stg = stages; stg->procs; ++stg) {
tsfprintf(stdout, "%x %s: %s\n", stg->id, stg->title, stg->subtitle);
tsfprintf(stdout, "%X %s: %s\n", stg->id, stg->title, stg->subtitle);
}
free_cli_action(&a);
@ -276,7 +276,7 @@ int main(int argc, char **argv) {
log_warn("Compiled with DEBUG flag!");
if(a.type == CLI_SelectStage) {
log_info("Entering stage skip mode: Stage %x", a.stageid);
log_info("Entering stage skip mode: Stage %X", a.stageid);
StageInfo* stg = stage_get(a.stageid);
assert(stg); // properly checked before this

2
src/menu/savereplay.c
View file

@ -35,7 +35,7 @@ void save_rpy(MenuData *menu, void *a) {
if(rpy->numstages > 1)
snprintf(name, 128, "taisei_%s_%s_%s", strtime, prepr, drepr);
else
snprintf(name, 128, "taisei_%s_stg%d_%s_%s", strtime, rpy->stages[0].stage, prepr, drepr);
snprintf(name, 128, "taisei_%s_stg%X_%s_%s", strtime, rpy->stages[0].stage, prepr, drepr);
replay_save(rpy, name);
}

2
src/progress.c
View file

@ -207,7 +207,7 @@ static void progress_read(SDL_RWops *file) {
p->num_played = np;
p->num_cleared = nc;
} else {
log_warn("Invalid stage %x ignored", stg);
log_warn("Invalid stage %X ignored", stg);
}
}
break;

4
src/replay.c
View file

@ -723,7 +723,7 @@ int replay_find_stage_idx(Replay *rpy, uint8_t stageid) {
}
}
log_warn("Stage %x was not found in the replay", stageid);
log_warn("Stage %X was not found in the replay", stageid);
return -1;
}
@ -744,7 +744,7 @@ void replay_play(Replay *rpy, int firstidx) {
StageInfo *gstg = stage_get(rstg->stage);
if(!gstg) {
log_warn("Invalid stage %x in replay at %i skipped.", rstg->stage, i);
log_warn("Invalid stage %X in replay at %i skipped.", rstg->stage, i);
continue;
}

2
src/stage.c
View file

@ -112,7 +112,7 @@ void stage_init_array(void) {
for(int j = 0; stages[j].procs; ++j) {
if(i != j && stages[i].id == stages[j].id) {
log_fatal("Duplicate ID 0x%04x in stages array, indices: %i, %i", stages[i].id, i, j);
log_fatal("Duplicate ID %X in stages array, indices: %i, %i", stages[i].id, i, j);
}
}
}