Merge branch 'renderswitch' of https://git.magicalgirl.moe/STJr/SRB2 into renderswitch
This commit is contained in:
commit
2d3f45de0d
|
@ -106,7 +106,7 @@ static vsbuf_t com_text; // variable sized buffer
|
||||||
*
|
*
|
||||||
* \param s The text.
|
* \param s The text.
|
||||||
* \param np Optionally a pointer to fill with the new string length.
|
* \param np Optionally a pointer to fill with the new string length.
|
||||||
* \return The new length.
|
* \return The text.
|
||||||
* \sa COM_ExecuteString
|
* \sa COM_ExecuteString
|
||||||
*/
|
*/
|
||||||
static char *
|
static char *
|
||||||
|
@ -427,16 +427,17 @@ static void COM_TokenizeString(char *ptext)
|
||||||
|
|
||||||
com_argc = 0;
|
com_argc = 0;
|
||||||
com_args = NULL;
|
com_args = NULL;
|
||||||
com_flags = 0;
|
|
||||||
|
if (ptext[0] == '\033')
|
||||||
|
{
|
||||||
|
com_flags = (unsigned)ptext[1];
|
||||||
|
ptext += 2;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
com_flags = 0;
|
||||||
|
|
||||||
while (com_argc < MAX_ARGS)
|
while (com_argc < MAX_ARGS)
|
||||||
{
|
{
|
||||||
if (ptext[0] == '\033')
|
|
||||||
{
|
|
||||||
com_flags = (unsigned)ptext[1];
|
|
||||||
ptext += 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Skip whitespace up to a newline.
|
// Skip whitespace up to a newline.
|
||||||
while (*ptext != '\0' && *ptext <= ' ' && *ptext != '\n')
|
while (*ptext != '\0' && *ptext <= ' ' && *ptext != '\n')
|
||||||
ptext++;
|
ptext++;
|
||||||
|
|
|
@ -65,7 +65,7 @@ consvar_t cv_renderview = {"renderview", "On", 0, CV_OnOff, NULL, 0, NULL, NULL,
|
||||||
|
|
||||||
static void SCR_ActuallyChangeRenderer(void);
|
static void SCR_ActuallyChangeRenderer(void);
|
||||||
static CV_PossibleValue_t cv_renderer_t[] = {{1, "Software"}, {2, "OpenGL"}, {0, NULL}};
|
static CV_PossibleValue_t cv_renderer_t[] = {{1, "Software"}, {2, "OpenGL"}, {0, NULL}};
|
||||||
consvar_t cv_renderer = {"renderer", "Software", CV_NOLUA|CV_CALL, cv_renderer_t, SCR_ChangeRenderer, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_renderer = {"renderer", "Software", CV_SAVE|CV_NOLUA|CV_CALL, cv_renderer_t, SCR_ChangeRenderer, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static void SCR_ChangeFullscreen(void);
|
static void SCR_ChangeFullscreen(void);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue