bound the fractions in CL_TraceLine instead of posting a warning, as out of bounds...

[xonotic/darkplaces.git] / screen.h

diff --git a/screen.h b/screen.h
index 273436a37bdda1804d17535a6d26f75b7bfe5623..bb7ba5b90c7a8a594a8650591b07533a6ecdc29b 100644 (file)
--- a/screen.h
+++ b/screen.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -19,31 +19,34 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // screen.h
 
-void SCR_Init (void);
+#ifndef SCREEN_H
+#define SCREEN_H
 
-void SCR_UpdateScreen (void);
+void CL_Screen_Init (void);
+void CL_UpdateScreen (void);
+void SCR_CenterPrint(char *str);
 
-
-void SCR_SizeUp (void);
-void SCR_SizeDown (void);
-void SCR_CenterPrint (char *str);
-
-//void SCR_BeginLoadingPlaque (void);
-//void SCR_EndLoadingPlaque (void);
+void SCR_BeginLoadingPlaque (void);
 
 extern float scr_con_current;
 extern float scr_conlines; // lines of console to display
 
 extern int sb_lines;
 
-extern int clearnotify; // set to 0 whenever notify text is drawn
-extern qboolean        scr_disabled_for_loading;
-extern qboolean        scr_skipupdate;
-
 extern cvar_t scr_viewsize;
-extern cvar_t r_brightness;
-extern cvar_t r_contrast;
-extern cvar_t gl_lightmode;
-extern cvar_t scr_viewsize;
-extern cvar_t crosshair;
+extern cvar_t scr_fov;
 extern cvar_t showfps;
+extern cvar_t showtime;
+extern cvar_t showdate;
+
+extern cvar_t crosshair;
+extern cvar_t crosshair_size;
+extern cvar_t crosshair_static;
+
+extern cvar_t scr_conspeed;
+extern cvar_t scr_conalpha;
+extern cvar_t scr_conbrightness;
+extern cvar_t r_letterbox;
+
+#endif
+