diff --git a/src/posix/sdl/sdlglvideo.cpp b/src/posix/sdl/sdlglvideo.cpp index 106b98d79..1e602f102 100644 --- a/src/posix/sdl/sdlglvideo.cpp +++ b/src/posix/sdl/sdlglvideo.cpp @@ -62,17 +62,20 @@ CUSTOM_CVAR(Bool, gl_debug, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINI { Printf("This won't take effect until " GAMENAME " is restarted.\n"); } -CUSTOM_CVAR(Bool, vid_glswfb, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) +#ifdef __arm__ +CUSTOM_CVAR(Bool, vid_glswfb, false, CVAR_NOINITCALL) { Printf("This won't take effect until " GAMENAME " is restarted.\n"); } - -#ifdef __arm__ -CUSTOM_CVAR(Bool, gl_es, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) +CUSTOM_CVAR(Bool, gl_es, false, CVAR_NOINITCALL) { Printf("This won't take effect until " GAMENAME " is restarted.\n"); } #else +CUSTOM_CVAR(Bool, vid_glswfb, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) +{ + Printf("This won't take effect until " GAMENAME " is restarted.\n"); +} CUSTOM_CVAR(Bool, gl_es, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) { Printf("This won't take effect until " GAMENAME " is restarted.\n"); diff --git a/src/scripting/backend/dynarrays.cpp b/src/scripting/backend/dynarrays.cpp index 2262af154..c12e602a0 100644 --- a/src/scripting/backend/dynarrays.cpp +++ b/src/scripting/backend/dynarrays.cpp @@ -99,7 +99,7 @@ DEFINE_ACTION_FUNCTION(FDynArray_I8, Delete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I8); PARAM_INT(index); - PARAM_INT(count); + PARAM_INT_DEF(count); self->Delete(index, count); return 0; } @@ -202,7 +202,7 @@ DEFINE_ACTION_FUNCTION(FDynArray_I16, Delete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I16); PARAM_INT(index); - PARAM_INT(count); + PARAM_INT_DEF(count); self->Delete(index, count); return 0; } @@ -305,7 +305,7 @@ DEFINE_ACTION_FUNCTION(FDynArray_I32, Delete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I32); PARAM_INT(index); - PARAM_INT(count); + PARAM_INT_DEF(count); self->Delete(index, count); return 0; } @@ -408,7 +408,7 @@ DEFINE_ACTION_FUNCTION(FDynArray_F32, Delete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F32); PARAM_INT(index); - PARAM_INT(count); + PARAM_INT_DEF(count); self->Delete(index, count); return 0; } @@ -511,7 +511,7 @@ DEFINE_ACTION_FUNCTION(FDynArray_F64, Delete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F64); PARAM_INT(index); - PARAM_INT(count); + PARAM_INT_DEF(count); self->Delete(index, count); return 0; } @@ -614,7 +614,7 @@ DEFINE_ACTION_FUNCTION(FDynArray_Ptr, Delete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Ptr); PARAM_INT(index); - PARAM_INT(count); + PARAM_INT_DEF(count); self->Delete(index, count); return 0; } @@ -718,7 +718,7 @@ DEFINE_ACTION_FUNCTION(FDynArray_String, Delete) { PARAM_SELF_STRUCT_PROLOGUE(FDynArray_String); PARAM_INT(index); - PARAM_INT(count); + PARAM_INT_DEF(count); self->Delete(index, count); return 0; } diff --git a/wadsrc/static/zscript/menu/loadsavemenu.txt b/wadsrc/static/zscript/menu/loadsavemenu.txt index 2154e1015..7fe354317 100644 --- a/wadsrc/static/zscript/menu/loadsavemenu.txt +++ b/wadsrc/static/zscript/menu/loadsavemenu.txt @@ -387,7 +387,7 @@ class LoadSaveMenu : ListMenu { if (ev.Type == UIEvent.Type_KeyDown) { - if (Selected < manager.SavegameCount()) + if (Selected != -1 && Selected < manager.SavegameCount()) { switch (ev.KeyChar) {