Merge branch 'v2dev23' into fixfogcrap

src/CMakeLists.txt

@@ -77,7 +77,7 @@ add_dependencies(SRB2SDL2 _SRB2_reconf)
 	
 ### use internal libraries?
 if(${CMAKE_SYSTEM} MATCHES "Windows") ###set on Windows only
-	set(SRB2_CONFIG_USE_INTERNAL_LIBRARIES OFF CACHE BOOL
+	set(SRB2_CONFIG_USE_INTERNAL_LIBRARIES ON CACHE BOOL
 	"Use SRB2Kart's internal copies of required dependencies (SDL2, PNG, zlib, GME, OpenMPT, cURL).")
 endif()
 

src/hardware/hw_clip.c

@@ -322,16 +322,13 @@ void gld_clipper_Clear(void)
 
 #define RMUL (1.6f/1.333333f)
 
-angle_t gld_FrustumAngle(angle_t tiltangle)
+angle_t gld_FrustumAngle(float render_fov, angle_t tiltangle)
 {
 	double floatangle;
 	angle_t a1;
 
 	float tilt = (float)fabs(((double)(int)tiltangle) / ANG1);
 
-	// NEWCLIP TODO: SRB2CBTODO: make a global render_fov for this function
-
-	float render_fov = FIXED_TO_FLOAT(cv_fov[viewssnum].value);
 	float render_fovratio = (float)BASEVIDWIDTH / (float)BASEVIDHEIGHT; // SRB2CBTODO: NEWCLIPTODO: Is this right?
 	float render_multiplier = 64.0f / render_fovratio / RMUL;
 

src/hardware/hw_clip.h

@@ -17,7 +17,7 @@
 boolean gld_clipper_SafeCheckRange(angle_t startAngle, angle_t endAngle);
 void gld_clipper_SafeAddClipRange(angle_t startangle, angle_t endangle);
 void gld_clipper_Clear(void);
-angle_t gld_FrustumAngle(angle_t tiltangle);
+angle_t gld_FrustumAngle(float render_fov, angle_t tiltangle);
 #ifdef HAVE_SPHEREFRUSTRUM
 void gld_FrustrumSetup(void);
 boolean gld_SphereInFrustum(float x, float y, float z, float radius);

src/m_menu.c

@@ -77,7 +77,7 @@
 #include "m_random.h"
 
 #if defined(HAVE_SDL)
-#include "SDL.h"
+#include <SDL.h>
 #if SDL_VERSION_ATLEAST(2,0,0)
 #include "sdl/sdlmain.h" // JOYSTICK_HOTPLUG
 #endif

src/sdl/SDL_main/SDL_windows_main.c

@@ -10,7 +10,7 @@
 #include <windows.h>
 
 /* Include the SDL main definition header */
-#include "SDL.h"
+#include <SDL.h>
 #include "SDL_main.h"
 
 #ifdef main

src/sdl/hwsym_sdl.c

@@ -31,7 +31,7 @@
 
 #ifdef HAVE_SDL
 
-#include "SDL.h"
+#include <SDL.h>
 
 #ifdef _MSC_VER
 #pragma warning(default : 4214 4244)

src/sdl/i_main.c

@@ -36,7 +36,7 @@
 #ifdef HAVE_SDL
 
 #ifdef HAVE_TTF
-#include "SDL.h"
+#include <SDL.h>
 #include "i_ttf.h"
 #endif
 

src/sdl/i_system.c

@@ -64,7 +64,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 
 #ifdef HAVE_SDL
 #define _MATH_DEFINES_DEFINED
-#include "SDL.h"
+#include <SDL.h>
 
 #ifdef HAVE_TTF
 #include "i_ttf.h"

src/sdl/i_ttf.c

@@ -17,7 +17,7 @@
 /// \brief SDL_ttf interface code. Necessary for platforms with no framebuffer console systems.
 
 #if defined(HAVE_SDL) && defined(HAVE_TTF)
-#include "SDL.h"
+#include <SDL.h>
 #include "SDL_ttf.h"
 #include "../doomdef.h"
 #include "../doomstat.h"

src/sdl/i_video.c

@@ -30,7 +30,7 @@
 
 #ifdef HAVE_SDL
 #define _MATH_DEFINES_DEFINED
-#include "SDL.h"
+#include <SDL.h>
 
 #ifdef _MSC_VER
 #include <windows.h>

src/sdl/mixer_sound.c

@@ -50,15 +50,15 @@ write netcode into the sound code, OKAY?
 #ifdef _MSC_VER
 #pragma warning(disable : 4214 4244)
 #endif
-#include "SDL.h"
+#include <SDL.h>
 #ifdef _MSC_VER
 #pragma warning(default : 4214 4244)
 #endif
 
 #ifdef HAVE_MIXERX
-#include "SDL_mixer_ext.h"
+#include <SDL_mixer_ext.h>
 #else
-#include "SDL_mixer.h"
+#include <SDL_mixer.h>
 #endif
 
 /* This is the version number macro for the current SDL_mixer version: */

src/sdl/ogl_sdl.c

@@ -25,7 +25,7 @@
 #ifdef HAVE_SDL
 #define _MATH_DEFINES_DEFINED
 
-#include "SDL.h"
+#include <SDL.h>
 
 #include "sdlmain.h"
 

src/sdl/sdl_sound.c

@@ -26,7 +26,7 @@
 
 #if defined(HAVE_SDL) && SOUND==SOUND_SDL
 
-#include "SDL.h"
+#include <SDL.h>
 
 #ifdef _MSC_VER
 #pragma warning(default : 4214 4244)

src/sdl12/hwsym_sdl.c

@@ -31,7 +31,7 @@
 
 #ifdef HAVE_SDL
 
-#include "SDL.h"
+#include <SDL.h>
 
 #ifdef _MSC_VER
 #pragma warning(default : 4214 4244)

src/sdl12/i_main.c

@@ -51,7 +51,7 @@ PSP_MAIN_THREAD_STACK_SIZE_KB(256);
 #ifdef HAVE_SDL
 
 #ifdef HAVE_TTF
-#include "SDL.h"
+#include <SDL.h>
 #include "i_ttf.h"
 #endif
 

src/sdl12/i_system.c

@@ -75,7 +75,7 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
 
 #ifdef HAVE_SDL
 
-#include "SDL.h"
+#include <SDL.h>
 
 #ifdef HAVE_TTF
 #include "i_ttf.h"

src/sdl12/i_video.c

@@ -29,7 +29,7 @@
 
 #ifdef HAVE_SDL
 
-#include "SDL.h"
+#include <SDL.h>
 
 #ifdef _MSC_VER
 #pragma warning(default : 4214 4244)

src/sdl12/sdl_sound.c

@@ -25,7 +25,7 @@
 
 #if defined(HAVE_SDL) && SOUND==SOUND_SDL
 
-#include "SDL.h"
+#include <SDL.h>
 
 #ifdef _MSC_VER
 #pragma warning(default : 4214 4244)