X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_video.h;h=7c6140fa26545a34e5b028d2156bac69d48924b3;hp=e96e2a478d4d9d3981c0ef5ff0ea17d3e5d947c9;hb=365e221966b15c24c6e2f4cbb6e619b0db443ebf;hpb=0766a43538f3b526cba347157d5259bb3e5785a9

diff --git a/cl_video.h b/cl_video.h
index e96e2a47..7c6140fa 100644
--- a/cl_video.h
+++ b/cl_video.h
@@ -2,6 +2,9 @@
 #ifndef CL_VIDEO_H
 #define CL_VIDEO_H
 
+#include "qtypes.h"
+#include "qdefs.h"
+
 #define CLVIDEOPREFIX	"video/"
 #define CLTHRESHOLD		2.0
 
@@ -20,14 +23,14 @@ typedef enum clvideostate_e
 
 #define CLVIDEO_MAX_SUBTITLES 512
 
-extern cvar_t cl_video_subtitles;
-extern cvar_t cl_video_subtitles_lines;
-extern cvar_t cl_video_subtitles_textsize;
-extern cvar_t cl_video_scale;
-extern cvar_t cl_video_scale_vpos;
-extern cvar_t cl_video_stipple;
-extern cvar_t cl_video_brightness;
-extern cvar_t cl_video_keepaspectratio;
+extern struct cvar_s cl_video_subtitles;
+extern struct cvar_s cl_video_subtitles_lines;
+extern struct cvar_s cl_video_subtitles_textsize;
+extern struct cvar_s cl_video_scale;
+extern struct cvar_s cl_video_scale_vpos;
+extern struct cvar_s cl_video_stipple;
+extern struct cvar_s cl_video_brightness;
+extern struct cvar_s cl_video_keepaspectratio;
 
 typedef struct clvideo_s
 {
@@ -44,7 +47,7 @@ typedef struct clvideo_s
 	void	*imagedata;
 
 	// cachepic holds the relevant texture_t and we simply update the texture as needed
-	cachepic_t *cachepic;
+	struct cachepic_s *cachepic;
 	char	name[MAX_QPATH]; // name of this video UI element (not the filename)
 	int		width;
 	int		height;
@@ -67,7 +70,7 @@ typedef struct clvideo_s
 	// used to determine whether the video's resources should be freed or not
     double  lasttime;
 	// when lasttime - realtime > THRESHOLD, all but the stream is freed
-	qboolean suspended;
+	qbool suspended;
 
 	char	filename[MAX_QPATH];
 } clvideo_t;
@@ -93,6 +96,6 @@ void CL_VideoStop( void );
 
 // new function used for fullscreen videos
 // TODO: Andreas Kirsch: move this subsystem somewhere else (preferably host) since the cl_video system shouldnt do such work like managing key events..
-void CL_Video_KeyEvent( int key, int ascii, qboolean down );
+void CL_Video_KeyEvent( int key, int ascii, qbool down );
 
 #endif