X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=screen.h;h=55b0e3f0a0c0786cf9fb0f281d706c1baad533a4;hb=ac8080688588aba1ab7934f7ba0c2ffea0c8eb91;hp=2e42b72fda917c8c8be5c50598c2b7164de35012;hpb=321a67123284c38c22f8edd418913615ee0c2682;p=xonotic%2Fdarkplaces.git

diff --git a/screen.h b/screen.h
index 2e42b72f..55b0e3f0 100644
--- a/screen.h
+++ b/screen.h
@@ -26,14 +26,15 @@ void CL_Screen_Init (void);
 void CL_UpdateScreen (void);
 void SCR_CenterPrint(const char *str);
 
-void SCR_BeginLoadingPlaque (void);
+void SCR_BeginLoadingPlaque (qboolean startup);
+void SCR_EndLoadingPlaque (void);
 
 // invoke refresh of loading plaque (nothing else seen)
-void SCR_UpdateLoadingScreen(qboolean clear);
+void SCR_UpdateLoadingScreen(qboolean clear, qboolean startup);
 void SCR_UpdateLoadingScreenIfShown(void);
 
 // pushes an item on the loading screen
-void SCR_PushLoadingScreen (qboolean redraw, const char *msg, float len_in_parent);
+void SCR_PushLoadingScreen (const char *msg, float len_in_parent);
 void SCR_PopLoadingScreen (qboolean redraw);
 void SCR_ClearLoadingScreen (qboolean redraw);
 
@@ -43,18 +44,49 @@ extern int sb_lines;
 
 extern cvar_t scr_viewsize;
 extern cvar_t scr_fov;
-extern cvar_t showfps;
-extern cvar_t showtime;
-extern cvar_t showdate;
+extern cvar_t cl_showfps;
+extern cvar_t cl_showtime;
+extern cvar_t cl_showdate;
 
 extern cvar_t crosshair;
 extern cvar_t crosshair_size;
 
 extern cvar_t scr_conalpha;
+extern cvar_t scr_conalphafactor;
+extern cvar_t scr_conalpha2factor;
+extern cvar_t scr_conalpha3factor;
+extern cvar_t scr_conscroll_x;
+extern cvar_t scr_conscroll_y;
+extern cvar_t scr_conscroll2_x;
+extern cvar_t scr_conscroll2_y;
+extern cvar_t scr_conscroll3_x;
+extern cvar_t scr_conscroll3_y;
 extern cvar_t scr_conbrightness;
 extern cvar_t r_letterbox;
 
 extern cvar_t scr_refresh;
+extern cvar_t scr_stipple;
+
+extern cvar_t r_stereo_separation;
+extern cvar_t r_stereo_angle;
+qboolean R_Stereo_Active(void);
+extern int r_stereo_side;
+
+typedef struct scr_touchscreenarea_s
+{
+	const char *pic;
+	const char *text;
+	float rect[4];
+	float textheight;
+	float active;
+	float activealpha;
+	float inactivealpha;
+}
+scr_touchscreenarea_t;
+
+// FIXME: should resize dynamically?
+extern int scr_numtouchscreenareas;
+extern scr_touchscreenarea_t scr_touchscreenareas[128];
 
 #endif