Merge PR 'Curl improvements'

[xonotic/darkplaces.git] / vid.h

diff --git a/vid.h b/vid.h
index b8cd2308d46d8fbaf1d86e2c12893afb55876192..8b8fa3f5da0e277ac010f4d053076d56ab08e232 100644 (file)
--- a/vid.h
+++ b/vid.h
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stddef.h>
 #include "qtypes.h"
-#include "cmd.h"
+struct cmd_state_s;
 
 #define ENGINE_ICON ( (gamemode == GAME_NEXUIZ) ? nexuiz_xpm : darkplaces_xpm )
 
@@ -115,10 +115,10 @@ vid_joystate_t;
 
 extern vid_joystate_t vid_joystate;
 
-extern cvar_t joy_index;
-extern cvar_t joy_enable;
-extern cvar_t joy_detected;
-extern cvar_t joy_active;
+extern struct cvar_s joy_index;
+extern struct cvar_s joy_enable;
+extern struct cvar_s joy_detected;
+extern struct cvar_s joy_active;
 
 float VID_JoyState_GetAxis(const vid_joystate_t *joystate, int axis, float sensitivity, float deadzone);
 void VID_ApplyJoyState(vid_joystate_t *joystate);
@@ -133,50 +133,50 @@ extern qbool vid_hidden;
 extern qbool vid_activewindow;
 extern qbool vid_supportrefreshrate;
 
-extern cvar_t vid_fullscreen;
-extern cvar_t vid_borderless;
-extern cvar_t vid_width;
-extern cvar_t vid_height;
-extern cvar_t vid_bitsperpixel;
-extern cvar_t vid_samples;
-extern cvar_t vid_refreshrate;
-extern cvar_t vid_userefreshrate;
-extern cvar_t vid_touchscreen_density;
-extern cvar_t vid_touchscreen_xdpi;
-extern cvar_t vid_touchscreen_ydpi;
-extern cvar_t vid_vsync;
-extern cvar_t vid_mouse;
-extern cvar_t vid_mouse_clickthrough;
-extern cvar_t vid_grabkeyboard;
-extern cvar_t vid_touchscreen;
-extern cvar_t vid_touchscreen_showkeyboard;
-extern cvar_t vid_touchscreen_supportshowkeyboard;
-extern cvar_t vid_stick_mouse;
-extern cvar_t vid_resizable;
-extern cvar_t vid_desktopfullscreen;
+extern struct cvar_s vid_fullscreen;
+extern struct cvar_s vid_borderless;
+extern struct cvar_s vid_width;
+extern struct cvar_s vid_height;
+extern struct cvar_s vid_bitsperpixel;
+extern struct cvar_s vid_samples;
+extern struct cvar_s vid_refreshrate;
+extern struct cvar_s vid_userefreshrate;
+extern struct cvar_s vid_touchscreen_density;
+extern struct cvar_s vid_touchscreen_xdpi;
+extern struct cvar_s vid_touchscreen_ydpi;
+extern struct cvar_s vid_vsync;
+extern struct cvar_s vid_mouse;
+extern struct cvar_s vid_mouse_clickthrough;
+extern struct cvar_s vid_grabkeyboard;
+extern struct cvar_s vid_touchscreen;
+extern struct cvar_s vid_touchscreen_showkeyboard;
+extern struct cvar_s vid_touchscreen_supportshowkeyboard;
+extern struct cvar_s vid_stick_mouse;
+extern struct cvar_s vid_resizable;
+extern struct cvar_s vid_desktopfullscreen;
 #ifdef WIN32
-extern cvar_t vid_ignore_taskbar;
+extern struct cvar_s vid_ignore_taskbar;
 #endif
-extern cvar_t vid_minwidth;
-extern cvar_t vid_minheight;
-extern cvar_t vid_sRGB;
-extern cvar_t vid_sRGB_fallback;
-
-extern cvar_t gl_finish;
-
-extern cvar_t v_gamma;
-extern cvar_t v_contrast;
-extern cvar_t v_brightness;
-extern cvar_t v_color_enable;
-extern cvar_t v_color_black_r;
-extern cvar_t v_color_black_g;
-extern cvar_t v_color_black_b;
-extern cvar_t v_color_grey_r;
-extern cvar_t v_color_grey_g;
-extern cvar_t v_color_grey_b;
-extern cvar_t v_color_white_r;
-extern cvar_t v_color_white_g;
-extern cvar_t v_color_white_b;
+extern struct cvar_s vid_minwidth;
+extern struct cvar_s vid_minheight;
+extern struct cvar_s vid_sRGB;
+extern struct cvar_s vid_sRGB_fallback;
+
+extern struct cvar_s gl_finish;
+
+extern struct cvar_s v_gamma;
+extern struct cvar_s v_contrast;
+extern struct cvar_s v_brightness;
+extern struct cvar_s v_color_enable;
+extern struct cvar_s v_color_black_r;
+extern struct cvar_s v_color_black_g;
+extern struct cvar_s v_color_black_b;
+extern struct cvar_s v_color_grey_r;
+extern struct cvar_s v_color_grey_g;
+extern struct cvar_s v_color_grey_b;
+extern struct cvar_s v_color_white_r;
+extern struct cvar_s v_color_white_g;
+extern struct cvar_s v_color_white_b;
 
 // brand of graphics chip
 extern const char *gl_vendor;
@@ -226,7 +226,7 @@ qbool VID_ShowingKeyboard(void);
 void VID_SetMouse (qbool fullscreengrab, qbool relative, qbool hidecursor);
 void VID_Finish (void);
 
-void VID_Restart_f(cmd_state_t *cmd);
+void VID_Restart_f(struct cmd_state_s *cmd);
 
 void VID_Start(void);
 void VID_Stop(void);