mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Adjust some messagebox-related material.
- Fix an issue where if the last line of an M_StartMessage was the longest, the box width wouldn't account for it. (port from v1) - Reduce length of some common error messages the Addons menu may produce. - Add a warning for attempting to run .cfg files, since I absentmindedly overwrote ringconfig.cfg with kartconfig.cfg info while testing...
This commit is contained in:
parent
594748ba13
commit
587f814ab3
1 changed files with 7 additions and 3 deletions
|
|
@ -1845,7 +1845,11 @@ void M_StartMessage(const char *string, void *routine, menumessagetype_t itemtyp
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i == strlen(message+start))
|
if (i == strlen(message+start))
|
||||||
|
{
|
||||||
start += i;
|
start += i;
|
||||||
|
if (i > max)
|
||||||
|
max = i;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
menumessage.x = (INT16)((BASEVIDWIDTH - 8*max-16)/2);
|
menumessage.x = (INT16)((BASEVIDWIDTH - 8*max-16)/2);
|
||||||
|
|
@ -6376,12 +6380,12 @@ void M_AddonsRefresh(void)
|
||||||
if (refreshdirmenu & REFRESHDIR_MAX)
|
if (refreshdirmenu & REFRESHDIR_MAX)
|
||||||
message = va("%c%s\x80\nMaximum number of addons reached.\nA file could not be loaded.\nIf you wish to play with this addon, restart the game to clear existing ones.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
|
message = va("%c%s\x80\nMaximum number of addons reached.\nA file could not be loaded.\nIf you wish to play with this addon, restart the game to clear existing ones.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
|
||||||
else
|
else
|
||||||
message = va("%c%s\x80\nA file was not loaded.\nCheck the console log for more information.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
|
message = va("%c%s\x80\nA file was not loaded.\nCheck the console log for more info.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
|
||||||
}
|
}
|
||||||
else if (refreshdirmenu & (REFRESHDIR_WARNING|REFRESHDIR_ERROR))
|
else if (refreshdirmenu & (REFRESHDIR_WARNING|REFRESHDIR_ERROR))
|
||||||
{
|
{
|
||||||
S_StartSound(NULL, sfx_s224);
|
S_StartSound(NULL, sfx_s224);
|
||||||
message = va("%c%s\x80\nA file was loaded with %s.\nCheck the console log for more information.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname, ((refreshdirmenu & REFRESHDIR_ERROR) ? "errors" : "warnings"));
|
message = va("%c%s\x80\nA file was loaded with %s.\nCheck the console log for more info.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname, ((refreshdirmenu & REFRESHDIR_ERROR) ? "errors" : "warnings"));
|
||||||
}
|
}
|
||||||
else if (majormods && !prevmajormods)
|
else if (majormods && !prevmajormods)
|
||||||
{
|
{
|
||||||
|
|
@ -6544,7 +6548,7 @@ void M_HandleAddons(INT32 choice)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EXT_CFG:
|
case EXT_CFG:
|
||||||
M_AddonExec(MA_YES);
|
M_StartMessage(va("%c%s\x80\nThis file may modify your settings.\nAttempt to run anyways? \n\n(Press A to confirm)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),FUNCPTRCAST(M_AddonExec),MM_YESNO);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EXT_LUA:
|
case EXT_LUA:
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue