client: fix wrong checks.

SNMetamorph · Oct 30, 2023 · 77fa815 · 77fa815
1 parent f950005
commit 77fa815
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/client/render/gl_deferred.cpp b/client/render/gl_deferred.cpp
@@ -554,7 +554,7 @@ void GL_SetupWorldScenePass( void )
 
 void GL_DrawDeferredPass( void )
 {
-	if( !tr.defSceneShader || !tr.defLightShader )
+	if( !tr.defSceneShader[0] || !tr.defSceneShader[1] || !tr.defLightShader )
 		return; // oops!
 
 	GL_DEBUG_SCOPE();

diff --git a/client/render/gl_grass.cpp b/client/render/gl_grass.cpp
@@ -1112,7 +1112,7 @@ find or add unique texture for grass
 byte R_GrassTextureForName( const char *name )
 {
 	byte i;
-	for( i = 0; i < GRASS_TEXTURES && grasstexs[i].name[0]; i++ )
+	for( i = 0; i <= GRASS_TEXTURES - 1 && grasstexs[i].name[0]; i++ )
 	{
 		if( !Q_stricmp( grasstexs[i].name, name ))
 			return i;	// found

diff --git a/client/render/gl_lightmap.cpp b/client/render/gl_lightmap.cpp
@@ -129,7 +129,8 @@ static void LM_GoToNextPage( void )
 
 	if( lms->state != LM_DONE ) return; // current atlas not completed
 
-	if( ++tr.current_lightmap_texture == MAX_LIGHTMAPS )
+	// There may be overflow because type of current_lightmap_texture is byte(uint8_t).
+	if( ++tr.current_lightmap_texture == 0 ) // MAX_LIGHTMAPS 
 		HOST_ERROR( "MAX_LIGHTMAPS limit exceded\n" );
 }
 
@@ -753,4 +754,4 @@ void R_UpdateSurfaceParams( mstudiosurface_t *surf )
 	// check for lightmap modification
 	if( FBitSet( surf->flags, SURF_LM_UPDATE|SURF_DM_UPDATE ))
 		R_UpdateLightMap( surf );
-}
+}