From 7e04e679a99044ab08eefb226ac1bdb9e40efc35 Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Mon, 7 Apr 2014 12:37:15 +0100
Subject: [PATCH 1/7] Player Spin Frame MD2 Interpolation

Player spin frames on MD2's interpolate correctly when moving slowly.
---
 src/hardware/hw_md2.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 0ab58c84e..1a55c7145 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1132,6 +1132,9 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 		spriteframe_t *sprframe;
 		float finalscale;
 
+		if (tics > durs)
+			durs = tics;
+
 		if (spr->mobj->flags2 & MF2_SHADOW)
 		{
 			Surf.FlatColor.s.alpha = 0x40;

From 25448dec368e03d11a4ad593732b57c01c49b15d Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Mon, 7 Apr 2014 09:58:02 -0400
Subject: [PATCH 2/7] Compile Win32 EXE with -gdwarf-2

---
 SRB2.cbp               | 19 ++++++++-----------
 Srb2.dev               | 18 +++++++++---------
 cpdebug.mk             |  4 ++--
 src/win32/Makefile.cfg |  4 ++++
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/SRB2.cbp b/SRB2.cbp
index a6be5757d..628e7da30 100644
--- a/SRB2.cbp
+++ b/SRB2.cbp
@@ -41,7 +41,6 @@ HW3SOUND for 3D hardware sound  support
 					<Add option="-DHAVE_BLUA" />
 				</Compiler>
 				<Linker>
-					<Add option="-g" />
 					<Add option="`sdl-config --libs`" />
 					<Add library="SDL_mixer" />
 				</Linker>
@@ -63,7 +62,6 @@ HW3SOUND for 3D hardware sound  support
 					<Add option="-DHAVE_BLUA" />
 				</Compiler>
 				<Linker>
-					<Add option="-g" />
 					<Add option="`sdl-config --libs`" />
 					<Add library="SDL_mixer" />
 				</Linker>
@@ -91,7 +89,6 @@ HW3SOUND for 3D hardware sound  support
 					<Add option="-DHAVE_BLUA" />
 				</Compiler>
 				<Linker>
-					<Add option="-g" />
 					<Add option="`sdl-config --libs`" />
 					<Add option="`libpng-config --libs`" />
 					<Add library="SDL_mixer" />
@@ -120,7 +117,6 @@ HW3SOUND for 3D hardware sound  support
 					<Add option="-DHAVE_BLUA" />
 				</Compiler>
 				<Linker>
-					<Add option="-g" />
 					<Add option="`sdl-config --libs`" />
 					<Add option="`libpng-config --libs`" />
 					<Add library="SDL_mixer" />
@@ -136,6 +132,7 @@ HW3SOUND for 3D hardware sound  support
 				<Compiler>
 					<Add option="-march=i586" />
 					<Add option="-g" />
+					<Add option="-gdwarf-2" />
 					<Add option="-D_GNU_SOURCE=1" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__USE_MINGW_ANSI_STDIO=0" />
@@ -157,7 +154,6 @@ HW3SOUND for 3D hardware sound  support
 					<Add directory="libs/gme/include" />
 				</Compiler>
 				<Linker>
-					<Add option="-g" />
 					<Add library="SDL" />
 					<Add library="SDL_mixer" />
 					<Add library="advapi32" />
@@ -183,6 +179,7 @@ HW3SOUND for 3D hardware sound  support
 					<Add option="-march=i586" />
 					<Add option="-O2" />
 					<Add option="-g" />
+					<Add option="-gdwarf-2" />
 					<Add option="-D_GNU_SOURCE=1" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__USE_MINGW_ANSI_STDIO=0" />
@@ -203,7 +200,6 @@ HW3SOUND for 3D hardware sound  support
 					<Add directory="libs/gme/include" />
 				</Compiler>
 				<Linker>
-					<Add option="-g" />
 					<Add library="SDL" />
 					<Add library="SDL_mixer" />
 					<Add library="advapi32" />
@@ -229,6 +225,7 @@ HW3SOUND for 3D hardware sound  support
 					<Add option="-march=i586" />
 					<Add option="-O2" />
 					<Add option="-g" />
+					<Add option="-gdwarf-2" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D_WINDOWS" />
 					<Add option="-DHWRENDER" />
@@ -248,7 +245,6 @@ HW3SOUND for 3D hardware sound  support
 					<Add directory="src/win32" />
 				</ResourceCompiler>
 				<Linker>
-					<Add option="-g" />
 					<Add library="advapi32" />
 					<Add library="dinput" />
 					<Add library="dxguid" />
@@ -278,6 +274,7 @@ HW3SOUND for 3D hardware sound  support
 					<Add option="-march=i586" />
 					<Add option="-O2" />
 					<Add option="-g" />
+					<Add option="-gdwarf-2" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D_WINDOWS" />
 					<Add option="-DHWRENDER" />
@@ -296,7 +293,6 @@ HW3SOUND for 3D hardware sound  support
 					<Add directory="src/win32" />
 				</ResourceCompiler>
 				<Linker>
-					<Add option="-g" />
 					<Add library="advapi32" />
 					<Add library="dinput" />
 					<Add library="dxguid" />
@@ -877,14 +873,15 @@ HW3SOUND for 3D hardware sound  support
 			<Add directory="src/win32" />
 			<Add directory="src/hardware/r_opengl" />
 		</Compiler>
-		<Linker>
-			<Add option="-g" />
-		</Linker>
 		<ExtraCommands>
 			<Add before="make -f comptime.mk all-before" />
 			<Add after="make -f cpdebug.mk all-after BIN=$(TARGET_OUTPUT_FILE)" />
 			<Mode after="always" />
 		</ExtraCommands>
+		<Unit filename="comptime.bat" />
+		<Unit filename="comptime.mk" />
+		<Unit filename="comptime.sh" />
+		<Unit filename="cpdebug.mk" />
 		<Unit filename="src/am_map.c">
 			<Option compilerVar="CC" />
 			<Option target="Debug Native/SDL" />
diff --git a/Srb2.dev b/Srb2.dev
index 561703864..00b7811e1 100644
--- a/Srb2.dev
+++ b/Srb2.dev
@@ -1501,7 +1501,7 @@ CompileCpp=0
 Link=1
 Priority=1000
 OverrideBuildCmd=1
-BuildCmd=$(CC) -g $(CFLAGS) -x assembler-with-cpp -c src/vid_copy.s -o $@
+BuildCmd=$(CC) $(CFLAGS) -x assembler-with-cpp -c src/vid_copy.s -o $@
 
 [Unit152]
 FileName=src\y_inter.h
@@ -2024,8 +2024,8 @@ Includes=libs/libpng-src;libs/zlib;libs/gme/include;libs/fmodex/inc;libs
 Libs=libs/libpng-src/projects;libs/zlib/win32;libs/miniupnpc/mingw32;libs/gme/win32;libs/gme/win32;libs/fmodex/lib
 ResourceIncludes=src/win32
 MakeIncludes=comptime.mk;cpdebug.mk
-Compiler=-DNDEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-Os_@@_-g_@@_-D_WINDOWS_@@_-DHAVE_PNG_@@_-DNOROPENGL_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_-DHAVE_LIBGME_@@_
-CppCompiler=-Os_@@_-g_@@_
+Compiler=-DNDEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-Os_@@_-g_@@_-gdwarf-2_@@_-D_WINDOWS_@@_-DHAVE_PNG_@@_-DNOROPENGL_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_-DHAVE_LIBGME_@@_
+CppCompiler=-Os_@@_-g_@@_-gdwarf-2_@@_
 Linker=-lgdi32_@@_-ldinput_@@_-ldxguid_@@_-lwinmm_@@_-lpng32_@@_-lz32_@@_-lminiupnpc_@@_-lws2_32_@@_-liphlpapi_@@_-mwindows_@@_-lgme.dll_@@_-lfmodex_@@_
 PreprocDefines=NORMALSRB2_@@_
 CompilerSettings=00000000001000000110e1
@@ -2051,8 +2051,8 @@ Includes=libs/libpng-src;libs/zlib;libs/gme/include;libs/fmodex/inc;libs
 Libs=libs/libpng-src/projects;libs/zlib/win32;libs/miniupnpc/mingw32;libs/gme/win32;libs/fmodex/lib
 ResourceIncludes=src/win32
 MakeIncludes=comptime.mk;cpdebug.mk
-Compiler=-D_DEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-O0_@@_-g_@@_-D_WINDOWS_@@_-DHAVE_PNG_@@_-DNOROPENGL_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_-DHAVE_LIBGME_@@_
-CppCompiler=-O0_@@_-g_@@_
+Compiler=-D_DEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-O0_@@_-g_@@_-gdwarf-2_@@_-D_WINDOWS_@@_-DHAVE_PNG_@@_-DNOROPENGL_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_-DHAVE_LIBGME_@@_
+CppCompiler=-O0_@@_-g_@@_-gdwarf-2_@@_
 Linker=-lgdi32_@@_-ldinput_@@_-ldxguid_@@_-lwinmm_@@_-lpng32_@@_-lz32_@@_-lminiupnpc_@@_-lws2_32_@@_-liphlpapi_@@_-mconsole_@@_-lgme.dll_@@_-lfmodex_@@_
 PreprocDefines=NORMALSRB2_@@_
 CompilerSettings=00000000000000100110e1
@@ -2228,8 +2228,8 @@ Includes=libs/libpng-src;libs/zlib;libs
 Libs=libs/libpng-src/projects;libs/zlib/win32;libs/miniupnpc/mingw32
 ResourceIncludes=src/win32
 MakeIncludes=comptime.mk;cpdebug.mk
-Compiler=-DNDEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-Os_@@_-g_@@_-DUSE_WGL_SWAP_@@_-DDIRECTFULLSCREEN_@@_-DSDL_@@_-DHWRENDER_@@_-DHW3SOUND_@@_-DHAVE_MIXER_@@_-DHAVE_PNG_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_
-CppCompiler=-Os_@@_-g_@@_
+Compiler=-DNDEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-Os_@@_-g_@@_-gdwarf-2_@@_-DUSE_WGL_SWAP_@@_-DDIRECTFULLSCREEN_@@_-DSDL_@@_-DHWRENDER_@@_-DHW3SOUND_@@_-DHAVE_MIXER_@@_-DHAVE_PNG_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_
+CppCompiler=-Os_@@_-g_@@_-gdwarf-2_@@_
 Linker=-lSDL_@@_-lSDL_Mixer_@@_-lpng32_@@_-lz32_@@_-lminiupnpc_@@_-lws2_32_@@_-liphlpapi_@@_-mconsole_@@_
 PreprocDefines=NORMALSRB2_@@_
 CompilerSettings=00000000001000000110e1
@@ -2305,8 +2305,8 @@ Includes=libs/libpng-src;libs/zlib;libs
 Libs=libs/libpng-src/projects;libs/zlib/win32;libs/miniupnpc/mingw32
 ResourceIncludes=src/win32
 MakeIncludes=comptime.mk;cpdebug.mk
-Compiler=-D_DEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-O0_@@_-g_@@_-DUSE_WGL_SWAP_@@_-DDIRECTFULLSCREEN_@@_-DSDL_@@_-DHWRENDER_@@_-DHW3SOUND_@@_-DHAVE_MIXER_@@_-DHAVE_PNG_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_
-CppCompiler=-O0_@@_-g_@@_
+Compiler=-D_DEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-O0_@@_-g_@@_-gdwarf-2_@@_-DUSE_WGL_SWAP_@@_-DDIRECTFULLSCREEN_@@_-DSDL_@@_-DHWRENDER_@@_-DHW3SOUND_@@_-DHAVE_MIXER_@@_-DHAVE_PNG_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_
+CppCompiler=-O0_@@_-g_@@_-gdwarf-2_@@_
 Linker=-lSDL_@@_-lSDL_Mixer_@@_-lpng32_@@_-lz32_@@_-lminiupnpc_@@_-lws2_32_@@_-liphlpapi_@@_-mconsole_@@_
 PreprocDefines=NORMALSRB2_@@_
 CompilerSettings=00000000000000100110e1
diff --git a/cpdebug.mk b/cpdebug.mk
index 440ffe384..6baedf227 100644
--- a/cpdebug.mk
+++ b/cpdebug.mk
@@ -24,9 +24,9 @@ all-after:
 	$(OBJCOPY) $(BIN) $(DBGNAME)
 	$(OBJCOPY) --strip-debug $(BIN)
 	-$(OBJCOPY) --add-gnu-debuglink=$(DBGNAME) $(BIN)
-	-$(GZIP) $(GZIP_OPTS) $(DBGNAME).txt
+	-$(GZIP) $(GZIP_OPTS) "$(DBGNAME).txt"
 ifndef COMSPEC
-	$(GZIP) $(GZIP_OPT2) $(DBGNAME).txt
+	-$(GZIP) $(GZIP_OPT2) "$(DBGNAME).txt"
 endif
 	-$(UPX) $(UPX_OPTS) $(BIN)
 
diff --git a/src/win32/Makefile.cfg b/src/win32/Makefile.cfg
index 8f4870c6f..2ebde6b23 100644
--- a/src/win32/Makefile.cfg
+++ b/src/win32/Makefile.cfg
@@ -27,6 +27,10 @@ ifndef GCC44
 	#OPTS+=-mms-bitfields
 endif
 
+ifndef MINGW64
+	OPTS+=-gdwarf-2
+endif
+
 ifndef SDL
 	OPTS+=-D_WINDOWS
 endif

From b63e99efd82d1f4062b294d892fb99bc952b97f3 Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Mon, 7 Apr 2014 17:08:04 +0100
Subject: [PATCH 3/7] OpenGL Screen Flip

Screen flipping in OpenGL is no longer done by inverting the screen
polygons.
---
 src/hardware/hw_defs.h           |  1 +
 src/hardware/hw_main.c           | 45 ++++++++++++++++++++------------
 src/hardware/hw_md2.c            |  5 ++++
 src/hardware/r_opengl/r_opengl.c | 29 ++++++++++++++------
 4 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h
index 98305da6d..70d776d9e 100644
--- a/src/hardware/hw_defs.h
+++ b/src/hardware/hw_defs.h
@@ -108,6 +108,7 @@ typedef struct
 	FLOAT       scalex,scaley,scalez;
 	FLOAT       fovxangle, fovyangle;
 	INT32       splitscreen;
+	boolean     flip;            // screenflip
 } FTransform;
 
 // Transformed vector, as passed to HWR API
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 341845a1d..fcb439645 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -4475,6 +4475,12 @@ void HWR_RenderSkyboxView(INT32 viewnumber, player_t *player)
 	//                     It should replace all other gr_viewxxx when finished
 	atransform.anglex = (float)(aimingangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES);
 	atransform.angley = (float)(viewangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES);
+
+	if (postimgtype == postimg_flip)
+		atransform.flip = true;
+	else
+		atransform.flip = false;
+
 	atransform.x      = gr_viewx;  // FIXED_TO_FLOAT(viewx)
 	atransform.y      = gr_viewy;  // FIXED_TO_FLOAT(viewy)
 	atransform.z      = gr_viewz;  // FIXED_TO_FLOAT(viewz)
@@ -4488,6 +4494,12 @@ void HWR_RenderSkyboxView(INT32 viewnumber, player_t *player)
 	// Transform for sprites
 	stransform.anglex = 0.0f;
 	stransform.angley = -270.0f;
+
+	if (postimgtype == postimg_flip)
+		stransform.flip = true;
+	else
+		stransform.flip = false;
+
 	stransform.x      = 0.0f;
 	stransform.y      = 0.0f;
 	stransform.z      = 0.0f;
@@ -4687,6 +4699,12 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
 	//                     It should replace all other gr_viewxxx when finished
 	atransform.anglex = (float)(aimingangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES);
 	atransform.angley = (float)(viewangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES);
+
+	if (postimgtype == postimg_flip)
+		atransform.flip = true;
+	else
+		atransform.flip = false;
+
 	atransform.x      = gr_viewx;  // FIXED_TO_FLOAT(viewx)
 	atransform.y      = gr_viewy;  // FIXED_TO_FLOAT(viewy)
 	atransform.z      = gr_viewz;  // FIXED_TO_FLOAT(viewz)
@@ -4700,6 +4718,12 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
 	// Transform for sprites
 	stransform.anglex = 0.0f;
 	stransform.angley = -270.0f;
+
+	if (postimgtype == postimg_flip)
+		stransform.flip = true;
+	else
+		stransform.flip = false;
+
 	stransform.x      = 0.0f;
 	stransform.y      = 0.0f;
 	stransform.z      = 0.0f;
@@ -5312,25 +5336,12 @@ void HWR_DoPostProcessor(player_t *player)
 		}
 		HWD.pfnPostImgRedraw(v);
 		disStart += 1;
-	}
-	else if (postimgtype == postimg_flip) //We like our screens inverted.
-	{
-		// 10 by 10 grid. 2 coordinates (xy)
-		float v[SCREENVERTS][SCREENVERTS][2];
-		UINT8 x, y;
-		UINT8 flipy;
 
-		for (x = 0; x < SCREENVERTS; x++)
-		{
-			for (y = 0, flipy = SCREENVERTS; y < SCREENVERTS; y++, flipy--)
-			{
-				// Flip the screen.
-				v[x][y][0] = (x/((float)(SCREENVERTS-1.0f)/9.0f))-4.5f;
-				v[x][y][1] = (flipy/((float)(SCREENVERTS-1.0f)/9.0f))-5.5f;
-			}
-		}
-		HWD.pfnPostImgRedraw(v);
+		// Capture the screen again for screen waving on the intermission
+		if(gamestate != GS_INTERMISSION)
+			HWD.pfnMakeScreenTexture();
 	}
+	// Flipping of the screen isn't done here anymore
 #endif // SHUFFLE
 }
 
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 1a55c7145..8a2e3a6a0 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1244,6 +1244,11 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 		// SRB2CBTODO: MD2 scaling support
 		finalscale *= FIXED_TO_FLOAT(spr->mobj->scale);
 
+		if (postimgtype == postimg_flip)
+			p.flip = true;
+		else
+			p.flip = false;
+
 		HWD.pfnDrawMD2i(buff, curr, durs, tics, next, &p, finalscale, flip, color);
 
 
diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c
index ded8d0767..731f5bcf3 100644
--- a/src/hardware/r_opengl/r_opengl.c
+++ b/src/hardware/r_opengl/r_opengl.c
@@ -628,9 +628,6 @@ void SetStates(void)
 #ifdef GL_LIGHT_MODEL_AMBIENT
 	GLfloat LightDiffuse[] = {1.0f, 1.0f, 1.0f, 1.0f};
 #endif
-#ifndef KOS_GL_COMPATIBILITY
-	GLfloat LightPos[] = {0.0f, 1.0f, 0.0f, 0.0f};
-#endif
 
 	DBG_Printf("SetStates()\n");
 
@@ -693,9 +690,6 @@ void SetStates(void)
 	pglLightModelfv(GL_LIGHT_MODEL_AMBIENT, LightDiffuse);
 	pglEnable(GL_LIGHT0);
 #endif
-#ifndef KOS_GL_COMPATIBILITY
-	pglLightfv(GL_LIGHT0, GL_POSITION, LightPos);
-#endif
 
 	// bp : when no t&l :)
 	pglLoadIdentity();
@@ -1720,6 +1714,11 @@ EXPORT void HWRAPI(DrawMD2i) (INT32 *gl_cmd_buffer, md2_frame_t *frame, UINT32 d
 	float scalex, scaley, scalez;
 	scalex = scaley = scalez = scale;
 
+	// Because Otherwise, scaling the screen negatively vertically breaks the lighting
+#ifndef KOS_GL_COMPATIBILITY
+	GLfloat LightPos[] = {0.0f, 1.0f, 0.0f, 0.0f};
+#endif
+
 	if (duration == 0)
 		duration = 1;
 
@@ -1760,10 +1759,19 @@ EXPORT void HWRAPI(DrawMD2i) (INT32 *gl_cmd_buffer, md2_frame_t *frame, UINT32 d
 
 	pglEnable(GL_CULL_FACE);
 
-	if (flipped)
+	// pos->flip is if the screen is flipped too
+	if (flipped != pos->flip) // If either are active, but not both, invert the model's culling
+	{
 		pglCullFace(GL_FRONT);
+	}
 	else
+	{
 		pglCullFace(GL_BACK);
+	}
+
+#ifndef KOS_GL_COMPATIBILITY
+	pglLightfv(GL_LIGHT0, GL_POSITION, LightPos);
+#endif
 
 	pglShadeModel(GL_SMOOTH);
 	if (color)
@@ -1872,7 +1880,12 @@ EXPORT void HWRAPI(SetTransform) (FTransform *stransform)
 	{
 		// keep a trace of the transformation for md2
 		memcpy(&md2_transform, stransform, sizeof (md2_transform));
-		pglScalef(stransform->scalex, stransform->scaley, -stransform->scalez);
+
+		if (stransform->flip)
+			pglScalef(stransform->scalex, -stransform->scaley, -stransform->scalez);
+		else
+			pglScalef(stransform->scalex, stransform->scaley, -stransform->scalez);
+
 		pglRotatef(stransform->anglex       , 1.0f, 0.0f, 0.0f);
 		pglRotatef(stransform->angley+270.0f, 0.0f, 1.0f, 0.0f);
 		pglTranslatef(-stransform->x, -stransform->z, -stransform->y);

From cec63aa4c008943015c0d882106134c37766d92d Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 8 Apr 2014 12:01:26 -0400
Subject: [PATCH 4/7] 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 731f5bcf3..2e57ae6e3 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 79b32a46e50fa1cdf10171e2b72dfd19f7c0f8b1 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 8 Apr 2014 12:01:26 -0400
Subject: [PATCH 5/7] 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 731f5bcf3..2e57ae6e3 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 <alam@srb2.org>
Date: Wed, 9 Apr 2014 12:27:29 -0400
Subject: [PATCH 6/7] 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 1bd35b629..703bb2d35 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 <<EOF > $path/comptime.h
 
 // Do not edit!  This file was autogenerated

From 2bd6573f5f1e2062ea3431325e1ed235d497df61 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 9 Apr 2014 14:52:38 -0400
Subject: [PATCH 7/7] 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 9ba099f1f..9daead788 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};