This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw.
commit 3eddd702a03628ee054e147c5895d8611c78704f Author: [email protected] <[email protected]@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a> Date: Sun Nov 16 20:49:58 2014 +0000 All: Set fog mode using GLES too (and fix a typo) --- MP/code/renderer/tr_main.c | 4 +++- MP/code/renderer/tr_shade.c | 2 +- SP/code/renderer/tr_main.c | 4 +++- SP/code/renderer/tr_shade.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/MP/code/renderer/tr_main.c b/MP/code/renderer/tr_main.c index 2ab903c..dcee8f0 100644 --- a/MP/code/renderer/tr_main.c +++ b/MP/code/renderer/tr_main.c @@ -94,7 +94,9 @@ void R_Fog( glfog_t *curfog ) { // only send changes if necessary -#ifndef VCMODS_OPENGLES +#ifdef VCMODS_OPENGLES + qglFogf( GL_FOG_MODE, curfog->mode ); +#else qglFogi( GL_FOG_MODE, curfog->mode ); #endif qglFogfv( GL_FOG_COLOR, curfog->color ); diff --git a/MP/code/renderer/tr_shade.c b/MP/code/renderer/tr_shade.c index 49fc9b6..69bf340 100644 --- a/MP/code/renderer/tr_shade.c +++ b/MP/code/renderer/tr_shade.c @@ -475,7 +475,7 @@ static void ProjectDlightTexture_altivec( void ) { float texCoordsArray[SHADER_MAX_VERTEXES][2]; byte colorArray[SHADER_MAX_VERTEXES][4]; #ifdef VCMODS_OPENGLES - glInext_t hitIndexes[SHADER_MAX_INDEXES]; + glIndex_t hitIndexes[SHADER_MAX_INDEXES]; #else unsigned hitIndexes[SHADER_MAX_INDEXES]; #endif diff --git a/SP/code/renderer/tr_main.c b/SP/code/renderer/tr_main.c index 41e297d..09ca893 100644 --- a/SP/code/renderer/tr_main.c +++ b/SP/code/renderer/tr_main.c @@ -93,7 +93,9 @@ void R_Fog( glfog_t *curfog ) { R_FogOn(); -#ifndef VCMODS_OPENGLES +#ifdef VCMODS_OPENGLES + qglFogf( GL_FOG_MODE, curfog->mode ); +#else qglFogi( GL_FOG_MODE, curfog->mode ); #endif qglFogfv( GL_FOG_COLOR, curfog->color ); diff --git a/SP/code/renderer/tr_shade.c b/SP/code/renderer/tr_shade.c index a05ab9a..f2e3b89 100644 --- a/SP/code/renderer/tr_shade.c +++ b/SP/code/renderer/tr_shade.c @@ -481,7 +481,7 @@ static void ProjectDlightTexture_altivec( void ) { float texCoordsArray[SHADER_MAX_VERTEXES][2]; byte colorArray[SHADER_MAX_VERTEXES][4]; #ifdef VCMODS_OPENGLES - glInext_t hitIndexes[SHADER_MAX_INDEXES]; + glIndex_t hitIndexes[SHADER_MAX_INDEXES]; #else unsigned hitIndexes[SHADER_MAX_INDEXES]; #endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
