diff --git a/src/posix/cocoa/i_video.mm b/src/posix/cocoa/i_video.mm index 71cb466fe4..5343930191 100644 --- a/src/posix/cocoa/i_video.mm +++ b/src/posix/cocoa/i_video.mm @@ -89,11 +89,6 @@ EXTERN_CVAR(Bool, vid_hidpi) EXTERN_CVAR(Int, vid_defwidth) EXTERN_CVAR(Int, vid_defheight) -CVAR(Int, win_x, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -CVAR(Int, win_y, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -CVAR(Int, win_w, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -CVAR(Int, win_h, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) - CUSTOM_CVAR(Bool, vid_autoswitch, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) { Printf("You must restart " GAMENAME " to apply graphics switching mode\n"); diff --git a/src/posix/sdl/sdlglvideo.cpp b/src/posix/sdl/sdlglvideo.cpp index 55e4b21e48..421e9292e9 100644 --- a/src/posix/sdl/sdlglvideo.cpp +++ b/src/posix/sdl/sdlglvideo.cpp @@ -83,12 +83,6 @@ CUSTOM_CVAR(Bool, gl_es, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCA Printf("This won't take effect until " GAMENAME " is restarted.\n"); } -CVAR(Int, win_x, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -CVAR(Int, win_y, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -CVAR(Int, win_w, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -CVAR(Int, win_h, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -CVAR(Bool, win_maximized, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) - CVAR(Bool, i_soundinbackground, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR (Int, vid_adapter, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) diff --git a/src/v_video.cpp b/src/v_video.cpp index aebd3b3166..df92fa3e19 100644 --- a/src/v_video.cpp +++ b/src/v_video.cpp @@ -68,6 +68,12 @@ EXTERN_CVAR(Bool, cl_capfps) +CVAR(Int, win_x, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) +CVAR(Int, win_y, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) +CVAR(Int, win_w, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) +CVAR(Int, win_h, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) +CVAR(Bool, win_maximized, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) + CUSTOM_CVAR(Int, vid_maxfps, 200, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) { if (vid_maxfps < TICRATE && vid_maxfps != 0) diff --git a/src/v_video.h b/src/v_video.h index f5cc1b7250..cbf9dd7b03 100644 --- a/src/v_video.h +++ b/src/v_video.h @@ -93,6 +93,7 @@ EXTERN_CVAR(Int, win_x) EXTERN_CVAR(Int, win_y) EXTERN_CVAR(Int, win_w) EXTERN_CVAR(Int, win_h) +EXTERN_CVAR(Bool, win_maximized) inline bool V_IsHardwareRenderer() diff --git a/src/win32/base_sysfb.cpp b/src/win32/base_sysfb.cpp index 8e07468e49..8324c250fc 100644 --- a/src/win32/base_sysfb.cpp +++ b/src/win32/base_sysfb.cpp @@ -62,11 +62,6 @@ extern "C" { __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1; } -CVAR(Int, win_x, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -CVAR(Int, win_y, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -CVAR(Int, win_w, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -CVAR(Int, win_h, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -CVAR(Bool, win_maximized, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) EXTERN_CVAR(Int, vid_defwidth) EXTERN_CVAR(Int, vid_defheight)