- Fixed compilation.

# Conflicts:
#	src/win32/win32video.cpp

src/d_main.cpp

@@ -132,6 +132,8 @@ void P_Shutdown();
 void M_SaveDefaultsFinal();
 void R_Shutdown();
 void I_ShutdownInput();
+void StopFPSLimit();
+void I_DeleteRenderer();
 
 const FIWADInfo *D_FindIWAD(TArray<FString> &wadfiles, const char *iwad, const char *basewad);
 
@@ -2879,6 +2881,7 @@ int D_DoomMain()
 	C_DeinitConsole();
 	R_DeinitColormaps();
 	R_Shutdown();
+	I_DeleteRenderer();
 	I_ShutdownGraphics();
 	I_ShutdownInput();
 	M_SaveDefaultsFinal();
@@ -2913,7 +2916,8 @@ void D_Cleanup()
 	AM_ClearColorsets();
 	DeinitSWColorMaps();
 	FreeSBarInfoScript();
-	
+	StopFPSLimit();
+
 	// clean up game state
 	ST_Clear();
 	D_ErrorCleanup ();

src/posix/cocoa/i_video.mm

@@ -1203,7 +1203,7 @@ void I_InitGraphics()
 }
 
 
-static void I_DeleteRenderer()
+void I_DeleteRenderer()
 {
 	delete Renderer;
 	Renderer = NULL;
@@ -1220,7 +1220,6 @@ void I_CreateRenderer()
 		Renderer = 1 == currentrenderer
 			? gl_CreateInterface()
 			: new FSoftwareRenderer;
-		atterm(I_DeleteRenderer);
 	}
 }
 

src/posix/sdl/hardware.cpp

@@ -131,7 +131,7 @@ void I_InitGraphics ()
 	Video->SetWindowedScale (vid_winscale);
 }
 
-static void I_DeleteRenderer()
+void I_DeleteRenderer()
 {
 	if (Renderer != NULL) delete Renderer;
 }
@@ -143,7 +143,6 @@ void I_CreateRenderer()
 	{
 		if (currentrenderer==1) Renderer = gl_CreateInterface();
 		else Renderer = new FSoftwareRenderer;
-		atterm(I_DeleteRenderer);
 	}
 }
 

src/win32/hardware.cpp

@@ -37,10 +37,6 @@
 
 #include "hardware.h"
 #include "win32iface.h"
-#include "i_video.h"
-#include "i_system.h"
-#include "c_console.h"
-#include "c_cvars.h"
 #include "c_dispatch.h"
 #include "v_text.h"
 #include "doomstat.h"
@@ -193,7 +189,7 @@ void I_InitGraphics ()
 	Video->SetWindowedScale (vid_winscale);
 }
 
-static void I_DeleteRenderer()
+void I_DeleteRenderer()
 {
 	if (Renderer != NULL) delete Renderer;
 }
@@ -216,7 +212,6 @@ void I_CreateRenderer()
 	{
 		if (currentrenderer==1) Renderer = gl_CreateInterface();
 		else Renderer = new FSoftwareRenderer;
-		atterm(I_DeleteRenderer);
 	}
 }
 

src/win32/i_input.cpp

@@ -46,16 +46,10 @@
 #define INITGUID
 #endif
 #include <windows.h>
-#include <mmsystem.h>
 #include <dbt.h>
 #include <dinput.h>
 #include <malloc.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-
 #ifdef _MSC_VER
 #pragma warning(disable:4244)
 #endif
@@ -78,7 +72,6 @@
 
 
 #include "c_dispatch.h"
-#include "doomtype.h"
 #include "doomdef.h"
 #include "doomstat.h"
 #include "m_argv.h"
@@ -89,14 +82,9 @@
 #include "d_main.h"
 #include "d_gui.h"
 #include "c_console.h"
-#include "c_cvars.h"
-#include "i_system.h"
 #include "s_sound.h"
-#include "m_misc.h"
 #include "gameconfigfile.h"
 #include "win32iface.h"
-#include "templates.h"
-#include "cmdlib.h"
 #include "d_event.h"
 #include "v_text.h"
 #include "version.h"

src/win32/i_main.cpp

@@ -49,7 +49,6 @@
 //#include <wtsapi32.h>
 #define NOTIFY_FOR_THIS_SESSION 0
 
-#include <stdlib.h>
 #ifdef _MSC_VER
 #include <eh.h>
 #include <new.h>
@@ -57,27 +56,17 @@
 #endif
 #include "resource.h"
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <math.h>
-
 #include "doomerrors.h"
 #include "hardware.h"
 
-#include "doomtype.h"
 #include "m_argv.h"
 #include "d_main.h"
 #include "i_module.h"
-#include "i_system.h"
 #include "c_console.h"
 #include "version.h"
-#include "i_video.h"
-#include "i_sound.h"
 #include "i_input.h"
 #include "w_wad.h"
-#include "templates.h"
 #include "cmdlib.h"
-#include "g_level.h"
 #include "doomstat.h"
 #include "r_utility.h"
 #include "g_levellocals.h"
@@ -91,8 +80,6 @@
 
 #include "optwin32.h"
 
-#include <assert.h>
-
 // MACROS ------------------------------------------------------------------
 
 // The main window's title.

src/win32/win32video.cpp

@@ -60,7 +60,6 @@
 #include "c_dispatch.h"
 #include "templates.h"
 #include "i_system.h"
-#include "atterm.h"
 #include "i_video.h"
 #include "v_video.h"
 #include "v_pfx.h"
@@ -90,7 +89,7 @@ void DoBlending (const PalEntry *from, PalEntry *to, int count, int r, int g, in
 
 // PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
 
-static void StopFPSLimit();
+void StopFPSLimit();
 
 // EXTERNAL DATA DECLARATIONS ----------------------------------------------
 
@@ -809,7 +808,7 @@ void I_SetFPSLimit(int limit)
 				return;
 			}
 		}
-		atterm(StopFPSLimit);
+
 		// Set timer event as close as we can to limit/sec, in milliseconds.
 		UINT period = 1000 / limit;
 		FPSLimitTimer = timeSetEvent(period, 0, (LPTIMECALLBACK)FPSLimitEvent, 0, TIME_PERIODIC | TIME_CALLBACK_EVENT_SET);
@@ -832,7 +831,7 @@ void I_SetFPSLimit(int limit)
 //
 //==========================================================================
 
-static void StopFPSLimit()
+void StopFPSLimit()
 {
 	I_SetFPSLimit(0);
 }