X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fsurface.c;h=b5dd724e15d9ee564b548f465129ec8d80108ff3;hb=2af64392f80ea19c416da54e346f0f70400710c8;hp=76385cb3ffd902b13977b066b734c098acffc913;hpb=4d1e944aca47338a45f451c593b63218598dc140;p=xonotic%2Fnetradiant.git

diff --git a/tools/quake3/q3map2/surface.c b/tools/quake3/q3map2/surface.c
index 76385cb3..b5dd724e 100644
--- a/tools/quake3/q3map2/surface.c
+++ b/tools/quake3/q3map2/surface.c
@@ -291,7 +291,7 @@ deletes all empty or bad surfaces from the surface list
 void TidyEntitySurfaces( entity_t *e )
 {
 	int					i, j, deleted;
-	mapDrawSurface_t	*out, *in;
+	mapDrawSurface_t	*out, *in = NULL;
 	
 	
 	/* note it */
@@ -1207,7 +1207,7 @@ DrawSurfaceForFlare() - ydnar
 creates a flare draw surface
 */
 
-mapDrawSurface_t *DrawSurfaceForFlare( int entNum, vec3_t origin, vec3_t normal, vec3_t color, char *flareShader, int lightStyle )
+mapDrawSurface_t *DrawSurfaceForFlare( int entNum, vec3_t origin, vec3_t normal, vec3_t color, const char *flareShader, int lightStyle )
 {
 	mapDrawSurface_t	*ds;
 	
@@ -2147,7 +2147,7 @@ subdivides a patch into an approximate curve and filters it into the tree
 
 static int FilterPatchIntoTree( mapDrawSurface_t *ds, tree_t *tree )
 {
-	int					x, y, refs;
+	int					x, y, refs = 0;
 	
 	for(y = 0; y + 2 < ds->patchHeight; y += 2)
 		for(x = 0; x + 2 < ds->patchWidth; x += 2)
@@ -3108,7 +3108,7 @@ int AddSurfaceModelsToTriangle_r( mapDrawSurface_t *ds, surfaceModel_t *model, b
 			/* roll the dice (model's odds scaled by vertex alpha) */
 			odds = model->odds * (tri[ 0 ]->color[ 0 ][ 3 ] + tri[ 0 ]->color[ 0 ][ 3 ] + tri[ 0 ]->color[ 0 ][ 3 ]) / 765.0f;
 			r = Random();
-			if( r > model->odds )
+			if( r > odds )
 				return 0;
 			
 			/* calculate scale */
@@ -3173,7 +3173,7 @@ int AddSurfaceModelsToTriangle_r( mapDrawSurface_t *ds, surfaceModel_t *model, b
 			}
 			
 			/* insert the model */
-			InsertModel( (char *) model->model, 0, transform, NULL, ds->celShader, ds->entityNum, ds->castShadows, ds->recvShadows, 0, ds->lightmapScale, 0, 0 );
+			InsertModel( (char *) model->model, 0, 0, transform, NULL, ds->celShader, ds->entityNum, ds->castShadows, ds->recvShadows, 0, ds->lightmapScale, 0, 0 );
 			
 			/* return to sender */
 			return 1;