mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-26 20:31:30 +00:00
Clean but quick: Rename all user-facing things that say "emblem" to say "medal" instead. Don't touch SOC, don't touch code, otherwise we'll be here all year.
This commit is contained in:
parent
390d2b4114
commit
cf16959ad5
4 changed files with 18 additions and 18 deletions
|
@ -4933,7 +4933,7 @@ static void Fishcake_OnChange(void)
|
|||
static void Command_Isgamemodified_f(void)
|
||||
{
|
||||
if (savemoddata)
|
||||
CONS_Printf(M_GetText("modifiedgame is true, but you can save emblem and time data in this mod.\n"));
|
||||
CONS_Printf(M_GetText("modifiedgame is true, but you can save medal and time data in this mod.\n"));
|
||||
else if (modifiedgame)
|
||||
CONS_Printf(M_GetText("modifiedgame is true, secrets will not be unlocked\n"));
|
||||
else
|
||||
|
|
14
src/m_cond.c
14
src/m_cond.c
|
@ -117,27 +117,27 @@ void M_SetupDefaultConditionSets(void)
|
|||
{
|
||||
memset(conditionSets, 0, sizeof(conditionSets));
|
||||
|
||||
// -- 1: Collect 5 emblems OR play 10 matches
|
||||
// -- 1: Collect 5 medals OR play 10 matches
|
||||
M_AddRawCondition(1, 1, UC_TOTALEMBLEMS, 5, 0, 0);
|
||||
M_AddRawCondition(1, 2, UC_MATCHESPLAYED, 10, 0, 0);
|
||||
|
||||
// -- 2: Collect 10 emblems OR play 25 matches
|
||||
// -- 2: Collect 10 medals OR play 25 matches
|
||||
M_AddRawCondition(2, 1, UC_TOTALEMBLEMS, 10, 0, 0);
|
||||
M_AddRawCondition(2, 2, UC_MATCHESPLAYED, 25, 0, 0);
|
||||
|
||||
// -- 3: Collect 20 emblems OR play 50 matches
|
||||
// -- 3: Collect 20 medals OR play 50 matches
|
||||
M_AddRawCondition(3, 1, UC_TOTALEMBLEMS, 20, 0, 0);
|
||||
M_AddRawCondition(3, 2, UC_MATCHESPLAYED, 50, 0, 0);
|
||||
|
||||
// -- 4: Collect 30 emblems OR play 100 matches
|
||||
// -- 4: Collect 30 medals OR play 100 matches
|
||||
M_AddRawCondition(4, 1, UC_TOTALEMBLEMS, 30, 0, 0);
|
||||
M_AddRawCondition(4, 2, UC_MATCHESPLAYED, 100, 0, 0);
|
||||
|
||||
// -- 5: Collect 40 emblems OR play 150 matches
|
||||
// -- 5: Collect 40 medals OR play 150 matches
|
||||
M_AddRawCondition(5, 1, UC_TOTALEMBLEMS, 40, 0, 0);
|
||||
M_AddRawCondition(5, 2, UC_MATCHESPLAYED, 150, 0, 0);
|
||||
|
||||
// -- 6: Collect 50 emblems ONLY
|
||||
// -- 6: Collect 50 medals ONLY
|
||||
M_AddRawCondition(6, 1, UC_TOTALEMBLEMS, 50, 0, 0);
|
||||
|
||||
// -- 10: Play 300 matches
|
||||
|
@ -318,7 +318,7 @@ UINT8 M_UpdateUnlockablesAndExtraEmblems(boolean force)
|
|||
continue;
|
||||
if ((extraemblems[i].collected = M_Achieved(extraemblems[i].conditionset - 1)) != false)
|
||||
{
|
||||
strcat(cechoText, va(M_GetText("Got \"%s\" emblem!\\"), extraemblems[i].name));
|
||||
strcat(cechoText, va(M_GetText("Got \"%s\" medal!\\"), extraemblems[i].name));
|
||||
++cechoLines;
|
||||
}
|
||||
}
|
||||
|
|
18
src/m_menu.c
18
src/m_menu.c
|
@ -593,7 +593,7 @@ static menuitem_t SPauseMenu[] =
|
|||
{
|
||||
// Pandora's Box will be shifted up if both options are available
|
||||
{IT_CALL | IT_STRING, NULL, "Pandora's Box...", M_PandorasBox, 16},
|
||||
{IT_CALL | IT_STRING, NULL, "Emblem Hints...", M_EmblemHints, 24},
|
||||
{IT_CALL | IT_STRING, NULL, "Medal Hints...", M_EmblemHints, 24},
|
||||
//{IT_CALL | IT_STRING, NULL, "Level Select...", M_LoadGameLevelSelect, 32},
|
||||
|
||||
{IT_CALL | IT_STRING, NULL, "Continue", M_SelectableClearMenus,48},
|
||||
|
@ -739,7 +739,7 @@ static menuitem_t SR_UnlockChecklistMenu[] =
|
|||
|
||||
static menuitem_t SR_EmblemHintMenu[] =
|
||||
{
|
||||
{IT_STRING|IT_CVAR, NULL, "Emblem Radar", &cv_itemfinder, 10},
|
||||
{IT_STRING|IT_CVAR, NULL, "Medal Radar", &cv_itemfinder, 10},
|
||||
{IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SPauseDef, 20}
|
||||
};
|
||||
|
||||
|
@ -5141,9 +5141,9 @@ static char *M_GetConditionString(condition_t cond)
|
|||
G_TicsToSeconds(cond.requirement),
|
||||
G_TicsToCentiseconds(cond.requirement));
|
||||
case UC_TOTALEMBLEMS:
|
||||
return va("Get %d emblems", cond.requirement);
|
||||
return va("Get %d medals", cond.requirement);
|
||||
case UC_EXTRAEMBLEM:
|
||||
return va("Get \"%s\" emblem", extraemblems[cond.requirement-1].name);
|
||||
return va("Get \"%s\" medal", extraemblems[cond.requirement-1].name);
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
|
@ -5249,7 +5249,7 @@ static void M_DrawEmblemHints(void)
|
|||
break;
|
||||
}
|
||||
if (!j)
|
||||
V_DrawCenteredString(160, 48, highlightflags, "No hidden emblems on this map.");
|
||||
V_DrawCenteredString(160, 48, highlightflags, "No hidden medals on this map.");
|
||||
|
||||
M_DrawGenericMenu();
|
||||
}
|
||||
|
@ -5547,7 +5547,7 @@ static void M_DrawLoadGameData(void)
|
|||
V_DrawCenteredString(ecks + 68, 144, V_ORANGEMAP, "PLAY WITHOUT SAVING");
|
||||
V_DrawCenteredString(ecks + 68, 156, 0, "THIS GAME WILL NOT BE");
|
||||
V_DrawCenteredString(ecks + 68, 164, 0, "SAVED, BUT YOU CAN STILL");
|
||||
V_DrawCenteredString(ecks + 68, 172, 0, "GET EMBLEMS AND SECRETS.");
|
||||
V_DrawCenteredString(ecks + 68, 172, 0, "GET MEDALS AND SECRETS.");
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
@ -6207,7 +6207,7 @@ static void M_DrawStatsMaps(int location)
|
|||
else if (dotopname)
|
||||
{
|
||||
V_DrawString(20, y, highlightflags, "LEVEL NAME");
|
||||
V_DrawString(248, y, highlightflags, "EMBLEMS");
|
||||
V_DrawString(256, y, highlightflags, "MEDALS");
|
||||
y += 8;
|
||||
dotopname = false;
|
||||
}
|
||||
|
@ -6233,7 +6233,7 @@ static void M_DrawStatsMaps(int location)
|
|||
if (dotopname && !location)
|
||||
{
|
||||
V_DrawString(20, y, highlightflags, "LEVEL NAME");
|
||||
V_DrawString(248, y, highlightflags, "EMBLEMS");
|
||||
V_DrawString(256, y, highlightflags, "MEDALS");
|
||||
y += 8;
|
||||
}
|
||||
else if (location)
|
||||
|
@ -6244,7 +6244,7 @@ static void M_DrawStatsMaps(int location)
|
|||
{
|
||||
if (i == -1)
|
||||
{
|
||||
V_DrawString(20, y, highlightflags, "EXTRA EMBLEMS");
|
||||
V_DrawString(20, y, highlightflags, "EXTRA MEDALS");
|
||||
if (location)
|
||||
{
|
||||
y += 8;
|
||||
|
|
|
@ -704,7 +704,7 @@ static void Y_UpdateRecordReplays(void)
|
|||
|
||||
// Check emblems when level data is updated
|
||||
if ((earnedEmblems = M_CheckLevelEmblems()))
|
||||
CONS_Printf(M_GetText("\x82" "Earned %hu emblem%s for Record Attack records.\n"), (UINT16)earnedEmblems, earnedEmblems > 1 ? "s" : "");
|
||||
CONS_Printf(M_GetText("\x82" "Earned %hu medal%s for Record Attack records.\n"), (UINT16)earnedEmblems, earnedEmblems > 1 ? "s" : "");
|
||||
|
||||
// Update timeattack menu's replay availability.
|
||||
CV_AddValue(&cv_nextmap, 1);
|
||||
|
|
Loading…
Reference in a new issue