X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=gl_rmisc.c;h=d570e3b2b67107c75b2ab23ec8b607c4346cbfa2;hb=a43126de2e9f940ee5b409f0086ef9e0d47c7f92;hp=72dc5e4355036dc81c21cad58a159335c31a814f;hpb=4d162c39ec059b7f3191fbb4fb18304bc9b1db59;p=xonotic%2Fdarkplaces.git

diff --git a/gl_rmisc.c b/gl_rmisc.c
index 72dc5e43..d570e3b2 100644
--- a/gl_rmisc.c
+++ b/gl_rmisc.c
@@ -22,41 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 
 
-
-/*
-==================
-R_InitTextures
-==================
-*/
-void	R_InitTextures (void)
-{
-	int		x,y, m;
-	byte	*dest;
-
-// create a simple checkerboard texture for the default
-	r_notexture_mip = Hunk_AllocName (sizeof(texture_t) + 16*16+8*8+4*4+2*2, "notexture");
-	
-	r_notexture_mip->width = r_notexture_mip->height = 16;
-	r_notexture_mip->offsets[0] = sizeof(texture_t);
-	r_notexture_mip->offsets[1] = r_notexture_mip->offsets[0] + 16*16;
-	r_notexture_mip->offsets[2] = r_notexture_mip->offsets[1] + 8*8;
-	r_notexture_mip->offsets[3] = r_notexture_mip->offsets[2] + 4*4;
-	r_notexture_mip->transparent = false;
-	
-	for (m=0 ; m<4 ; m++)
-	{
-		dest = (byte *)r_notexture_mip + r_notexture_mip->offsets[m];
-		for (y=0 ; y< (16>>m) ; y++)
-			for (x=0 ; x< (16>>m) ; x++)
-			{
-				if (  (y< (8>>m) ) ^ (x< (8>>m) ) )
-					*dest++ = 0;
-				else
-					*dest++ = 0xff;
-			}
-	}	
-}
-
 /*
 ===============
 R_Envmap_f
@@ -128,15 +93,15 @@ void R_Envmap_f (void)
 
 void R_InitParticles (void);
 
-void gl_misc_start()
+void gl_misc_start(void)
 {
 }
 
-void gl_misc_shutdown()
+void gl_misc_shutdown(void)
 {
 }
 
-void gl_misc_newmap()
+void gl_misc_newmap(void)
 {
 }
 
@@ -153,15 +118,14 @@ void GL_Misc_Init (void)
 	R_RegisterModule("GL_Misc", gl_misc_start, gl_misc_shutdown, gl_misc_newmap);
 }
 
-void R_ClearParticles (void);
-void GL_BuildLightmaps (void);
+extern void R_ClearParticles (void);
+extern void GL_BuildLightmaps (void);
 
 /*
 ===============
 R_NewMap
 ===============
 */
-void SHOWLMP_clear();
 void R_NewMap (void)
 {
 	int		i;
@@ -170,29 +134,14 @@ void R_NewMap (void)
 		d_lightstylevalue[i] = 264;		// normal light value
 
 	memset (&r_worldentity, 0, sizeof(r_worldentity));
-	r_worldentity.model = cl.worldmodel;
+	r_worldentity.render.model = cl.worldmodel;
 	currententity = &r_worldentity;
 
-// clear out efrags in case the level hasn't been reloaded
-// FIXME: is this one short?
-	for (i=0 ; i<cl.worldmodel->numleafs ; i++)
-		cl.worldmodel->leafs[i].efrags = NULL;
-		 	
 	r_viewleaf = NULL;
 	R_Modules_NewMap();
 
 	GL_BuildLightmaps ();
 
-	// identify sky texture
-	skytexturenum = -1;
-	for (i=0 ; i<cl.worldmodel->numtextures ; i++)
-	{
-		if (!cl.worldmodel->textures[i])
-			continue;
-		if (!strncmp(cl.worldmodel->textures[i]->name,"sky",3) )
-			skytexturenum = i;
- 		cl.worldmodel->textures[i]->texturechain = NULL;
-	}
 	SHOWLMP_clear();
 }
 
@@ -211,14 +160,16 @@ void R_TimeRefresh_f (void)
 	float		start, stop, time;
 
 	intimerefresh = 1;
-	start = Sys_FloatTime ();
-	for (i=0 ; i<128 ; i++)
+	start = Sys_DoubleTime ();
+	for (i = 0;i < 128;i++)
 	{
+		r_refdef.viewangles[0] = 0;
 		r_refdef.viewangles[1] = i/128.0*360.0;
+		r_refdef.viewangles[2] = 0;
 		SCR_UpdateScreen();
 	}
 
-	stop = Sys_FloatTime ();
+	stop = Sys_DoubleTime ();
 	intimerefresh = 0;
 	time = stop-start;
 	Con_Printf ("%f seconds (%f fps)\n", time, 128/time);