[Quake2world-dev] r51 - quake2world/trunk/src

[jdolan at jdolan.dyndns.org]

Author: jdolan
Date: 2008-12-29 03:42:44 +0000 (Mon, 29 Dec 2008)
New Revision: 51

Modified:
   quake2world/trunk/src/r_state.c
   quake2world/trunk/src/r_state.h
   quake2world/trunk/src/r_surface.c
Log:
Reorder R_EnableBumpmap parameters for consistency.

Modified: quake2world/trunk/src/r_state.c
===================================================================
--- quake2world/trunk/src/r_state.c	2008-12-28 21:21:58 UTC (rev 50)
+++ quake2world/trunk/src/r_state.c	2008-12-29 03:42:44 UTC (rev 51)
@@ -357,7 +357,7 @@
 /*
 R_EnableBumpmap
 */
-inline void R_EnableBumpmap(qboolean enable, material_t *material){
+inline void R_EnableBumpmap(material_t *material, qboolean enable){
 
 	if(!r_state.lighting_enabled)
 		return;

Modified: quake2world/trunk/src/r_state.h
===================================================================
--- quake2world/trunk/src/r_state.h	2008-12-28 21:21:58 UTC (rev 50)
+++ quake2world/trunk/src/r_state.h	2008-12-29 03:42:44 UTC (rev 51)
@@ -108,7 +108,7 @@
 void R_EnableTexture(r_texunit_t *texunit, qboolean enable);
 void R_EnableColorArray(qboolean enable);
 void R_EnableLighting(r_program_t *program, qboolean enable);
-void R_EnableBumpmap(qboolean enable, material_t *material);
+void R_EnableBumpmap(material_t *material, qboolean enable);
 void R_EnableWarp(r_program_t *program, qboolean enable);
 void R_EnableFog(qboolean enable);
 void R_Setup3D(void);

Modified: quake2world/trunk/src/r_surface.c
===================================================================
--- quake2world/trunk/src/r_surface.c	2008-12-28 21:21:58 UTC (rev 50)
+++ quake2world/trunk/src/r_surface.c	2008-12-29 03:42:44 UTC (rev 51)
@@ -61,10 +61,10 @@
 				R_BindDeluxemapTexture(surf->deluxemap_texnum);
 				R_BindNormalmapTexture(image->normalmap->texnum);
 
-				R_EnableBumpmap(true, &image->material);
+				R_EnableBumpmap(&image->material, true);
 			}
 			else
-				R_EnableBumpmap(false, NULL);
+				R_EnableBumpmap(NULL, false);
 		}
 
 		if(surf->lightframe == r_locals.lightframe)  // dynamic light sources
@@ -109,7 +109,7 @@
 	if(r_state.lighting_enabled){
 
 		if(r_state.bumpmap_enabled)
-			R_EnableBumpmap(false, NULL);
+			R_EnableBumpmap(NULL, false);
 
 		R_EnableLights(0);
 	}