From e50cdbad0c3b686043e94eda314b58a743b19027 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 22 Dec 2019 10:21:10 +0000
Subject: [PATCH] SW, KenBuild: Remove some unnecessary #ifdef RENDERTYPEWIN

git-svn-id: https://svn.eduke32.com/eduke32@8482 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/kenbuild/src/config.cpp
#	source/sw/src/config.cpp
#	source/sw/src/game.cpp
---
 source/sw/src/config.cpp | 2 ++
 source/sw/src/game.cpp   | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/sw/src/config.cpp b/source/sw/src/config.cpp
index 740c54c6e..284d7c52a 100644
--- a/source/sw/src/config.cpp
+++ b/source/sw/src/config.cpp
@@ -41,6 +41,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 // we load this in to get default button and key assignments
 // as well as setting up function mappings
 
+#include "renderlayer.h"
+
 #if defined RENDERTYPESDL && defined SDL_TARGET && SDL_TARGET > 1
 # include "sdl_inc.h"
 #endif
diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp
index 0a004f4d9..e396f461f 100644
--- a/source/sw/src/game.cpp
+++ b/source/sw/src/game.cpp
@@ -714,7 +714,7 @@ void MultiSharewareCheck(void)
     if (!SW_SHAREWARE) return;
     if (numplayers > 4)
     {
-#ifdef RENDERTYPEWIN
+#if 1 /* defined RENDERTYPEWIN */
         wm_msgbox(apptitle,"To play a Network game with more than 4 players you must purchase "
                   "the full version.  Read the Ordering Info screens for details.");
 #else
@@ -2536,7 +2536,7 @@ void _Assert(const char *expr, const char *strFile, unsigned uLine)
 
     TerminateGame();
 
-#if 1 //def RENDERTYPEWIN
+#if 1 /* defined RENDERTYPEWIN */
     wm_msgbox(apptitle, "%s", ds);
 #else
     printf("Assertion failed: %s\n %s, line %u\n", expr, strFile, uLine);
@@ -2553,7 +2553,7 @@ void _ErrMsg(const char *strFile, unsigned uLine, const char *format, ...)
     //MONO_PRINT(ds);
     TerminateGame();
 
-#if 1 //def RENDERTYPEWIN
+#if 1 /* defined RENDERTYPEWIN */
     {
         char msg[256], *p;
         Bsnprintf(msg, sizeof(msg), "Error: %s, line %u\n", strFile, uLine);