Merge branch 'final-hours' into 'next'
Last-minute fixes See merge request STJr/SRB2!1483
This commit is contained in:
commit
1355a82aa5
|
@ -1568,11 +1568,6 @@ static void CL_LoadReceivedSavegame(boolean reloading)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("Can't load the level!\n"));
|
CONS_Alert(CONS_ERROR, M_GetText("Can't load the level!\n"));
|
||||||
Z_Free(savebuffer);
|
|
||||||
save_p = NULL;
|
|
||||||
if (unlink(tmpsave) == -1)
|
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("Can't delete %s\n"), tmpsave);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// done
|
// done
|
||||||
|
|
|
@ -1045,7 +1045,7 @@ void D_SRB2Main(void)
|
||||||
// Print GPL notice for our console users (Linux)
|
// Print GPL notice for our console users (Linux)
|
||||||
CONS_Printf(
|
CONS_Printf(
|
||||||
"\n\nSonic Robo Blast 2\n"
|
"\n\nSonic Robo Blast 2\n"
|
||||||
"Copyright (C) 1998-2020 by Sonic Team Junior\n\n"
|
"Copyright (C) 1998-2021 by Sonic Team Junior\n\n"
|
||||||
"This program comes with ABSOLUTELY NO WARRANTY.\n\n"
|
"This program comes with ABSOLUTELY NO WARRANTY.\n\n"
|
||||||
"This is free software, and you are welcome to redistribute it\n"
|
"This is free software, and you are welcome to redistribute it\n"
|
||||||
"and/or modify it under the terms of the GNU General Public License\n"
|
"and/or modify it under the terms of the GNU General Public License\n"
|
||||||
|
|
|
@ -361,9 +361,6 @@ static int lib_cvRegisterVar(lua_State *L)
|
||||||
size_t count = 0;
|
size_t count = 0;
|
||||||
CV_PossibleValue_t *cvpv;
|
CV_PossibleValue_t *cvpv;
|
||||||
|
|
||||||
const char * const MINMAX[2] = {"MIN", "MAX"};
|
|
||||||
int minmax_unset = 3;
|
|
||||||
|
|
||||||
lua_pushnil(L);
|
lua_pushnil(L);
|
||||||
while (lua_next(L, 4)) {
|
while (lua_next(L, 4)) {
|
||||||
count++;
|
count++;
|
||||||
|
@ -380,45 +377,16 @@ static int lib_cvRegisterVar(lua_State *L)
|
||||||
i = 0;
|
i = 0;
|
||||||
lua_pushnil(L);
|
lua_pushnil(L);
|
||||||
while (lua_next(L, 4)) {
|
while (lua_next(L, 4)) {
|
||||||
INT32 n;
|
|
||||||
const char * strval;
|
|
||||||
|
|
||||||
// stack: [...] PossibleValue table, index, value
|
// stack: [...] PossibleValue table, index, value
|
||||||
// 4 5 6
|
// 4 5 6
|
||||||
if (lua_type(L, 5) != LUA_TSTRING
|
if (lua_type(L, 5) != LUA_TSTRING
|
||||||
|| lua_type(L, 6) != LUA_TNUMBER)
|
|| lua_type(L, 6) != LUA_TNUMBER)
|
||||||
FIELDERROR("PossibleValue", "custom PossibleValue table requires a format of string=integer, i.e. {MIN=0, MAX=9999}");
|
FIELDERROR("PossibleValue", "custom PossibleValue table requires a format of string=integer, i.e. {MIN=0, MAX=9999}");
|
||||||
|
cvpv[i].strvalue = Z_StrDup(lua_tostring(L, 5));
|
||||||
strval = lua_tostring(L, 5);
|
cvpv[i].value = (INT32)lua_tonumber(L, 6);
|
||||||
|
|
||||||
if (
|
|
||||||
stricmp(strval, MINMAX[n=0]) == 0 ||
|
|
||||||
stricmp(strval, MINMAX[n=1]) == 0
|
|
||||||
){
|
|
||||||
/* need to shift forward */
|
|
||||||
if (minmax_unset == 3)
|
|
||||||
{
|
|
||||||
memmove(&cvpv[2], &cvpv[0],
|
|
||||||
i * sizeof *cvpv);
|
|
||||||
}
|
|
||||||
cvpv[n].strvalue = MINMAX[n];
|
|
||||||
minmax_unset &= ~(1 << n);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
n = i;
|
|
||||||
cvpv[n].strvalue = Z_StrDup(strval);
|
|
||||||
}
|
|
||||||
|
|
||||||
cvpv[n].value = (INT32)lua_tonumber(L, 6);
|
|
||||||
|
|
||||||
i++;
|
i++;
|
||||||
lua_pop(L, 1);
|
lua_pop(L, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (minmax_unset)
|
|
||||||
FIELDERROR("PossibleValue", "custom PossibleValue table requires requires both MIN and MAX keys if one is present");
|
|
||||||
|
|
||||||
cvpv[i].value = 0;
|
cvpv[i].value = 0;
|
||||||
cvpv[i].strvalue = NULL;
|
cvpv[i].strvalue = NULL;
|
||||||
cvar->PossibleValue = cvpv;
|
cvar->PossibleValue = cvpv;
|
||||||
|
|
Loading…
Reference in New Issue