fix replay menu to use consistent character name spelling

This commit is contained in:
Andrei Alexeyev 2019-04-16 08:30:45 +03:00
parent 2d6b41d759
commit 9b47cf8697
No known key found for this signature in database
GPG key ID: 363707CD4C7FE8A4
4 changed files with 5 additions and 6 deletions

View file

@ -265,8 +265,7 @@ static void replayview_drawitem(MenuEntry *e, int item, int cnt) {
if(plrmode == NULL) {
strlcpy(tmp, "?????", sizeof(tmp));
} else {
plrmode_repr(tmp, sizeof(tmp), plrmode);
tmp[0] = tmp[0] - 'a' + 'A';
plrmode_repr(tmp, sizeof(tmp), plrmode, false);
}
break;

View file

@ -25,7 +25,7 @@ static void do_save_replay(Replay *rpy) {
ReplayStage *stg = rpy->stages;
filename_timestamp(strtime, sizeof(strtime), stg->init_time);
plrmode_repr(prepr, 16, plrmode_find(stg->plr_char, stg->plr_shot));
plrmode_repr(prepr, 16, plrmode_find(stg->plr_char, stg->plr_shot), true);
strlcpy(drepr, difficulty_name(stg->diff), 16);
drepr[0] += 'a' - 'A';

View file

@ -44,12 +44,12 @@ void plrchar_preload(PlayerCharacter *pc) {
preload_resource(RES_SPRITE, pc->dialog_sprite_name, RESF_DEFAULT);
}
int plrmode_repr(char *out, size_t outsize, PlayerMode *mode) {
int plrmode_repr(char *out, size_t outsize, PlayerMode *mode, bool internal) {
assert(mode->character != NULL);
assert((unsigned)mode->shot_mode < NUM_SHOT_MODES_PER_CHARACTER);
return snprintf(out, outsize, "%s%c",
mode->character->lower_name,
internal ? mode->character->lower_name : mode->character->proper_name,
mode->shot_mode + 'A'
);
}

View file

@ -110,7 +110,7 @@ PlayerCharacter* plrchar_get(CharacterID id);
void plrchar_preload(PlayerCharacter *pc);
PlayerMode* plrmode_find(CharacterID charid, ShotModeID shotid);
int plrmode_repr(char *out, size_t outsize, PlayerMode *mode);
int plrmode_repr(char *out, size_t outsize, PlayerMode *mode, bool internal);
PlayerMode* plrmode_parse(const char *name);
void plrmode_preload(PlayerMode *mode);