From cec63aa4c008943015c0d882106134c37766d92d Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Tue, 8 Apr 2014 12:01:26 -0400 Subject: [PATCH 1/3] restore ISO C90 support in r_opengl --- src/hardware/r_opengl/r_opengl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 731f5bcf..2e57ae6e 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -1711,8 +1711,7 @@ EXPORT void HWRAPI(DrawMD2i) (INT32 *gl_cmd_buffer, md2_frame_t *frame, UINT32 d float pol; UINT32 newtime; - float scalex, scaley, scalez; - scalex = scaley = scalez = scale; + float scalex = scale, scaley = scale, scalez = scale; // Because Otherwise, scaling the screen negatively vertically breaks the lighting #ifndef KOS_GL_COMPATIBILITY From cb9494effafb542416b68b1590836a0ff32b9afe Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Wed, 9 Apr 2014 12:27:29 -0400 Subject: [PATCH 2/3] use git describe to get the tag+version --- comptime.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comptime.sh b/comptime.sh index 1bd35b62..703bb2d3 100755 --- a/comptime.sh +++ b/comptime.sh @@ -5,7 +5,7 @@ if [ x"$1" != x ]; then fi versiongit() { - gitversion=`git svn log HEAD --limit=1 --oneline | cut -f 1 -d " "` + gitversion=`git describe` cat < $path/comptime.h // Do not edit! This file was autogenerated From 2bd6573f5f1e2062ea3431325e1ed235d497df61 Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Wed, 9 Apr 2014 14:52:38 -0400 Subject: [PATCH 3/3] grsoftwarefog is still hardware only --- src/v_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/v_video.c b/src/v_video.c index 9ba099f1..9daead78 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -39,7 +39,6 @@ UINT8 *screens[5]; // screens[4] = fade screen end, postimage tempoarary buffer static CV_PossibleValue_t gamma_cons_t[] = {{0, "MIN"}, {4, "MAX"}, {0, NULL}}; -static CV_PossibleValue_t grsoftwarefog_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "LightPlanes"}, {0, NULL}}; static void CV_usegamma_OnChange(void); consvar_t cv_ticrate = {"showfps", "No", 0, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -59,6 +58,7 @@ static void CV_Gammaxxx_ONChange(void); // - You can change them in software, // but they won't do anything. static CV_PossibleValue_t grgamma_cons_t[] = {{1, "MIN"}, {255, "MAX"}, {0, NULL}}; +static CV_PossibleValue_t grsoftwarefog_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "LightPlanes"}, {0, NULL}}; consvar_t cv_voodoocompatibility = {"gr_voodoocompatibility", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_grfovchange = {"gr_fovchange", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};