model_brush: Demote a Host_Error to Con_Printf warn for irregular lightmap sizes

[xonotic/darkplaces.git] / screen.h

diff --git a/screen.h b/screen.h
index b88a80d53ca1cf0f15d7ae81b543f6d612eb3ce9..55b0e3f0a0c0786cf9fb0f281d706c1baad533a4 100644 (file)
--- 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,9 +44,9 @@ 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;
@@ -74,13 +75,18 @@ 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[16];
+extern scr_touchscreenarea_t scr_touchscreenareas[128];
 
 #endif