Patched to compile on Linux, and cleaned out almost all compiler warnings.

Sources/CMakeLists.txt

@@ -69,6 +69,11 @@ if(LINUX OR MACOSX)
     #CXXFLAGS += -fexceptions -frtti
 endif()
 
+if(CMAKE_COMPILER_IS_GNUCC)
+    # !!! FIXME: turn a bunch of these off, this is just for now. I hope.  --ryan.
+    add_definitions(-Wno-invalid-offsetof)
+endif()
+
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     # !!! FIXME: turn a bunch of these off, this is just for now. I hope.  --ryan.
     add_definitions(-Wno-unused-value)
@@ -587,13 +592,58 @@ add_executable(SeriousSam
     SeriousSam/SeriousSam.cpp
     SeriousSam/VarList.cpp
     SeriousSam/Credits.cpp
-    SeriousSam/Menu.cpp
     SeriousSam/GLSettings.cpp
-    SeriousSam/MenuGadgets.cpp
     SeriousSam/LCDDrawing.cpp
-    SeriousSam/MenuPrinting.cpp
     SeriousSam/SplashScreen.cpp
     SeriousSam/MainWindow.cpp
+    SeriousSam/GUI/Menus/GameMenu.cpp
+    SeriousSam/GUI/Menus/MAudioOptions.cpp
+    SeriousSam/GUI/Menus/MConfirm.cpp
+    SeriousSam/GUI/Menus/MControls.cpp
+    SeriousSam/GUI/Menus/MCustomizeAxis.cpp
+    SeriousSam/GUI/Menus/MCustomizeKeyboard.cpp
+    SeriousSam/GUI/Menus/MDisabled.cpp
+    SeriousSam/GUI/Menus/MenuActions.cpp
+    SeriousSam/GUI/Menus/Menu.cpp
+    SeriousSam/GUI/Menus/MenuManager.cpp
+    SeriousSam/GUI/Menus/MenuPrinting.cpp
+    SeriousSam/GUI/Menus/MenuStartersAF.cpp
+    SeriousSam/GUI/Menus/MenuStarters.cpp
+    SeriousSam/GUI/Menus/MenuStuff.cpp
+    SeriousSam/GUI/Menus/MHighScore.cpp
+    SeriousSam/GUI/Menus/MInGame.cpp
+    SeriousSam/GUI/Menus/MLevels.cpp
+    SeriousSam/GUI/Menus/MLoadSave.cpp
+    SeriousSam/GUI/Menus/MMain.cpp
+    SeriousSam/GUI/Menus/MNetwork.cpp
+    SeriousSam/GUI/Menus/MNetworkJoin.cpp
+    SeriousSam/GUI/Menus/MNetworkOpen.cpp
+    SeriousSam/GUI/Menus/MNetworkStart.cpp
+    SeriousSam/GUI/Menus/MOptions.cpp
+    SeriousSam/GUI/Menus/MPlayerProfile.cpp
+    SeriousSam/GUI/Menus/MSelectPlayers.cpp
+    SeriousSam/GUI/Menus/MServers.cpp
+    SeriousSam/GUI/Menus/MSinglePlayer.cpp
+    SeriousSam/GUI/Menus/MSinglePlayerNew.cpp
+    SeriousSam/GUI/Menus/MSplitScreen.cpp
+    SeriousSam/GUI/Menus/MSplitStart.cpp
+    SeriousSam/GUI/Menus/MVar.cpp
+    SeriousSam/GUI/Menus/MVideoOptions.cpp
+    SeriousSam/GUI/Components/MenuGadget.cpp
+    SeriousSam/GUI/Components/MGArrow.cpp
+    SeriousSam/GUI/Components/MGButton.cpp
+    SeriousSam/GUI/Components/MGChangePlayer.cpp
+    SeriousSam/GUI/Components/MGEdit.cpp
+    SeriousSam/GUI/Components/MGFileButton.cpp
+    SeriousSam/GUI/Components/MGHighScore.cpp
+    SeriousSam/GUI/Components/MGKeyDefinition.cpp
+    SeriousSam/GUI/Components/MGLevelButton.cpp
+    SeriousSam/GUI/Components/MGModel.cpp
+    SeriousSam/GUI/Components/MGServerList.cpp
+    SeriousSam/GUI/Components/MGSlider.cpp
+    SeriousSam/GUI/Components/MGTitle.cpp
+    SeriousSam/GUI/Components/MGTrigger.cpp
+    SeriousSam/GUI/Components/MGVarButton.cpp
 )
 add_dependencies(SeriousSam ParseAllEntities)
 

Sources/Ecc/Main.h

@@ -65,7 +65,7 @@ struct SType {
     iLine = other.iLine;
     return *this;
   };
-  const SType &operator=(char *str) {
+  const SType &operator=(const char *str) {
     strString = strdup(str);
     bCrossesStates = 0;
     iLine = -1;

Sources/Ecc/Parser.y

@@ -983,7 +983,7 @@ procedure_implementation
     sscanf($3.strString, "%s %s", strInputEventType, strInputEventName);
 
     char strStateID[256];
-    char *strBaseStateID = "-1";
+    const char *strBaseStateID = "-1";
     if(strcmp(RemoveLineDirective(strProcedureName), "Main")==0){
       strcpy(strStateID, "1");
       if(strncmp(strInputEventType, "EVoid", 4)!=0 && _strCurrentThumbnail[2]!=0) {

Sources/Engine/Base/CRCTable.cpp

@@ -43,12 +43,6 @@ public:
 extern CDynamicStackArray<CTFileName> _afnmNoCRC;
 extern BOOL FileMatchesList(CDynamicStackArray<CTFileName> &afnm, const CTFileName &fnm);
 
-#ifndef SE_INCL_CRCTABLE_CPP
-#define SE_INCL_CRCTABLE_CPP
-#ifdef PRAGMA_ONCE
-  #pragma once
-#endif
-
 #define TYPE CCRCEntry
 #define CNameTable_TYPE CNameTable_CCRCEntry
 #define CNameTableSlot_TYPE CNameTableSlot_CCRCEntry
@@ -200,5 +194,3 @@ ULONG CRCT_MakeCRCForFiles_t(CTStream &strmFiles)  // throw char *
 }
 
 
-#endif  /* include-once check. */
-

Sources/Engine/Base/ErrorReporting.cpp

@@ -168,7 +168,7 @@ BOOL YesNoMessage(const char *strFormat, ...)
 /*
  * Throw an exception of formatted string.
  */
-void ThrowF_t(char *strFormat, ...)  // throws char *
+void ThrowF_t(const char *strFormat, ...)  // throws char *
 {
   const SLONG slBufferSize = 256;
   //char strBuffer[slBufferSize+1];  // Can't throw from the stack like this!

Sources/Engine/Base/ErrorReporting.h

@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #endif
 
 /* Throw an exception of formatted string. */
-ENGINE_API extern void ThrowF_t(char *strFormat, ...); // throws char *
+ENGINE_API extern void ThrowF_t(const char *strFormat, ...); // throws char *
 /* Report error and terminate program. */
 ENGINE_API extern void FatalError(const char *strFormat, ...);
 /* Report warning without terminating program (stops program until user responds). */

Sources/Engine/Base/ErrorTable.h

@@ -21,8 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct ErrorCode {
   SLONG ec_Code;        // error code value
-  char *ec_Name;        // error code constant name (in .h files)
+  const char *ec_Name;        // error code constant name (in .h files)
-  char *ec_Description; // error description (in help files)
+  const char *ec_Description; // error description (in help files)
 };
 
 struct ErrorTable {

Sources/Engine/Base/IFeel.cpp

@@ -211,13 +211,13 @@ void IFeel_UnloadFile()
   if(immUnloadFile!=NULL) immUnloadFile();
 }
 // plays effect from ifr file
-void IFeel_PlayEffect(char *pstrEffectName)
+void IFeel_PlayEffect(const char *pstrEffectName)
 {
   IFeel_ChangeGain(ifeel_fGain);
   if(immPlayEffect!=NULL) immPlayEffect(pstrEffectName);
 }
 // stops effect from ifr file
-void IFeel_StopEffect(char *pstrEffectName)
+void IFeel_StopEffect(const char *pstrEffectName)
 {
   if(immStopEffect!=NULL) immStopEffect(pstrEffectName);
 }

Sources/Engine/Base/IFeel.h

@@ -25,8 +25,8 @@ ENGINE_API CTString IFeel_GetProductName();
 ENGINE_API CTString IFeel_GetProjectFileName();
 ENGINE_API BOOL IFeel_LoadFile(CTFileName fnFile);
 ENGINE_API void IFeel_UnLoadFile();
-ENGINE_API void IFeel_PlayEffect(char *pstrEffectName);
+ENGINE_API void IFeel_PlayEffect(const char *pstrEffectName);
-ENGINE_API void IFeel_StopEffect(char *pstrEffectName);
+ENGINE_API void IFeel_StopEffect(const char *pstrEffectName);
 ENGINE_API void IFeel_ChangeGain(FLOAT fGain);
 
 #endif  /* include-once check. */

Sources/Engine/Base/Memory.cpp

@@ -68,7 +68,6 @@ void NewHandler(void)
   // terminate program
   FatalError(TRANS("Not enough memory!"));
 }
-#define _CrtCheckMemory()
 #endif
 
 /* Static class used for initializing memory handlers. */

Sources/Engine/Base/ReplaceFile.cpp

@@ -52,7 +52,7 @@ BOOL _bFileReplacingApplied;
 
 extern INDEX wed_bUseBaseForReplacement;
 
-static CTFileName CallFileRequester(char *achrTitle, char *achrSelectedFile, char *pFilter)
+static CTFileName CallFileRequester(char *achrTitle, char *achrSelectedFile, const char *pFilter)
 {
 #ifdef PLATFORM_WIN32
   typedef CTFileName FileRequester_t(
@@ -75,7 +75,8 @@ static CTFileName CallFileRequester(char *achrTitle, char *achrSelectedFile, cha
     return CTString("");
   }
 
-  return pFileRequester( achrTitle, pFilter, "Replace file directory", achrSelectedFile);
+  // !!! FIXME: make this const correct?  --ryan.
+  return pFileRequester( achrTitle, (char *) pFilter, "Replace file directory", achrSelectedFile);
 
 #else
 
@@ -86,7 +87,7 @@ static CTFileName CallFileRequester(char *achrTitle, char *achrSelectedFile, cha
 }
 
 BOOL GetReplacingFile(CTFileName fnSourceFile, CTFileName &fnReplacingFile,
-                      char *pFilter)
+                      const char *pFilter)
 {
   // don't replace files if this console variable is set
   if (!wed_bUseBaseForReplacement) {

Sources/Engine/Base/ReplaceFile.h

@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 extern BOOL _bFileReplacingApplied;
 
 BOOL GetReplacingFile(CTFileName fnSourceTexture, CTFileName &fnReplacingTexture,
-                      char *pFilter);
+                      const char *pFilter);
 void SetTextureWithPossibleReplacing_t(CTextureObject &to, CTFileName &fnmTexture);
 
 // read/write a texture object

Sources/Engine/Base/SDL/SDLInput.cpp

@@ -70,8 +70,8 @@ NOTE: Two different types of key codes are used here:
 static struct KeyConversion {
   INDEX kc_iKID;
   INDEX kc_iVirtKey;
-  char *kc_strName;
+  const char *kc_strName;
-  char *kc_strNameTrans;
+  const char *kc_strNameTrans;
 } _akcKeys[] = {
 
   // reserved for 'no-key-pressed'

Sources/Engine/Base/Stream.cpp

@@ -279,7 +279,7 @@ void CTStream::DisableStreamHandling(void)
 /*
  * Throw an exception of formatted string.
  */
-void CTStream::Throw_t(char *strFormat, ...)  // throws char *
+void CTStream::Throw_t(const char *strFormat, ...)  // throws char *
 {
   const SLONG slBufferSize = 256;
   char strFormatBuffer[slBufferSize];

Sources/Engine/Base/Stream.h

@@ -84,7 +84,7 @@ public:
   CDynamicStackArray<CTFileName> strm_afnmDictionary; // dictionary is stored here
 
   /* Throw an exception of formatted string. */
-  void Throw_t(char *strFormat, ...); // throw char *
+  void Throw_t(const char *strFormat, ...); // throw char *
   // read the dictionary from given offset in file (internal function)
   void ReadDictionary_intenal_t(SLONG slOffset);
   // copy filename dictionary from another stream

Sources/Engine/Base/Translation.cpp

@@ -190,10 +190,11 @@ ENGINE_API void AddTranslationTablesDir_t(const CTFileName &fnmDir, const CTFile
   }
 }
 
+// !!! FIXME: clean these out.
 // translate a string
-ENGINE_API char *Translate(char *str, INDEX iOffset)
+ENGINE_API char *Translate(const char *str, INDEX iOffset)
 {
-  return (char*)TranslateConst((const char*)str, iOffset);
+  return (char*)TranslateConst(str, iOffset);
 }
 
 ENGINE_API const char *TranslateConst(const char *str, INDEX iOffset)

Sources/Engine/Base/Translation.h

@@ -33,7 +33,7 @@ ENGINE_API void ReadTranslationTable_t(
   CDynamicArray<class CTranslationPair> &atpPairs, const CTFileName &fnmTable); // throw char *
 
 // translate a string
-ENGINE_API char * Translate(char *str, INDEX iOffset=0);
+ENGINE_API char * Translate(const char *str, INDEX iOffset=0);
 ENGINE_API const char * TranslateConst(const char *str, INDEX iOffset=0);
 
 // macro for inserting a string for translation into executables

Sources/Engine/Brushes/BrushTriangularize.cpp

@@ -155,7 +155,7 @@ public:
   void AddBestTriangleToTriangles(void);
 
   /* Print a statement to debugging output file. */
-  void DPrintF(char *strFormat, ...);
+  void DPrintF(const char *strFormat, ...);
   /* Dump triangle edges to debug output. */
   void DumpEdges(void);
 
@@ -584,7 +584,7 @@ void EdgeDir(const DOUBLE3D &vPoint0, const DOUBLE3D &vPoint1,
 /*
  * Print a statement to debugging output file.
  */
-void CTriangularizer::DPrintF(char *strFormat, ...)
+void CTriangularizer::DPrintF(const char *strFormat, ...)
 {
   char strBuffer[256];
   // format the message in buffer

Sources/Engine/GameAgent/GameAgent.cpp

@@ -26,7 +26,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <Engine/Network/SessionState.h>
 #include <GameMP/SessionProperties.h>
 #include <Engine/GameAgent/GameAgent.h>
-#include <Engine/GameAgent/MSLegacy.h>
+
+#if defined(PLATFORM_WIN32)
+#pragma comment(lib, "wsock32.lib")
+WSADATA* _wsaData = NULL;
+typedef int socklen_t;
+#else
+#include <fcntl.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#define INVALID_SOCKET -1
+#define SOCKET_ERROR   -1
+#define closesocket close
+typedef int SOCKET;
+typedef struct hostent HOSTENT, *PHOSTENT;
+typedef struct sockaddr_in SOCKADDR_IN;
+typedef struct sockaddr    SOCKADDR;
+#define WSAGetLastError() (INDEX) errno
+#define WSACleanup()
+#endif
 
 #define MSPORT      28900
 #define BUFFSZ      8192
@@ -102,26 +123,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define SERIOUSSAMKEY       "AKbna4\0"
 #define SERIOUSSAMSTR       "serioussamse"
 
-#if defined(PLATFORM_WIN32)
+#include <Engine/GameAgent/MSLegacy.h>
-#pragma comment(lib, "wsock32.lib")
-WSADATA* _wsaData = NULL;
-typedef int socklen_t;
-#else
-#include <fcntl.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <errno.h>
-#define INVALID_SOCKET -1
-#define SOCKET_ERROR   -1
-#define closesocket close
-typedef int SOCKET;
-typedef struct hostent HOSTENT;
-typedef struct sockaddr_in SOCKADDR_IN;
-typedef struct sockaddr    SOCKADDR;
-#define WSAGetLastError() (INDEX) errno
-#endif
 
 SOCKET _socket = INVALID_SOCKET;
 
@@ -131,9 +133,9 @@ sockaddr_in _sinFrom;
 
 CHAR* _szBuffer = NULL;
 CHAR* _szIPPortBuffer = NULL;
-INT   _iIPPortBufferLen = 0;
+LONG   _iIPPortBufferLen = 0;
 CHAR* _szIPPortBufferLocal = NULL;
-INT   _iIPPortBufferLocalLen = 0;
+LONG   _iIPPortBufferLocalLen = 0;
 
 BOOL _bServer = FALSE;
 BOOL _bInitialized = FALSE;
@@ -463,14 +465,14 @@ extern void GameAgent_ServerUpdate(void)
           strLocation = "Heartland";
         }
         strPacket.PrintF( PCKQUERY,
-          _pShell->GetString("sam_strGameName"),
+          (const char *) _pShell->GetString("sam_strGameName"),
           _SE_VER_STRING,
-          //_pShell->GetString("net_strLocalHost"),
+          //(const char *) _pShell->GetString("net_strLocalHost"),
-          strLocation,
+          (const char *) strLocation,
-          _pShell->GetString("gam_strSessionName"),
+          (const char *) _pShell->GetString("gam_strSessionName"),
           _pShell->GetINDEX("net_iPort"),
-          _pNetwork->ga_World.wo_strName,
+          (const char *) _pNetwork->ga_World.wo_strName,
-          _getGameModeName(_getSP()->sp_gmGameMode),
+          (const char *) _getGameModeName(_getSP()->sp_gmGameMode),
           _pNetwork->ga_srvServer.GetPlayersCount(),
           _pNetwork->ga_sesSessionState.ses_ctMaxPlayers,
           _pShell->GetINDEX("gam_bFriendlyFire"),
@@ -506,10 +508,10 @@ extern void GameAgent_ServerUpdate(void)
 
         CTString strPacket;
         strPacket.PrintF( PCKINFO,
-          _pShell->GetString("gam_strSessionName"),
+          (const char *) _pShell->GetString("gam_strSessionName"),
           _pShell->GetINDEX("net_iPort"),
-          _pNetwork->ga_World.wo_strName,
+          (const char *) _pNetwork->ga_World.wo_strName,
-          _getGameModeName(_getSP()->sp_gmGameMode),
+          (const char *) _getGameModeName(_getSP()->sp_gmGameMode),
           _pNetwork->ga_srvServer.GetPlayersCount(),
           _pNetwork->ga_sesSessionState.ses_ctMaxPlayers);
         _sendPacketTo(strPacket, &_sinFrom);
@@ -523,10 +525,10 @@ extern void GameAgent_ServerUpdate(void)
           strLocation = "Heartland";
         }
         strPacket.PrintF( PCKBASIC,
-          _pShell->GetString("sam_strGameName"),
+          (const char *) _pShell->GetString("sam_strGameName"),
           _SE_VER_STRING,
-          //_pShell->GetString("net_strLocalHost"));
+          //(const char *) _pShell->GetString("net_strLocalHost"));
-          strLocation);
+          (const char *) strLocation);
         _sendPacketTo(strPacket, &_sinFrom);
 
       } else if (sPch4){
@@ -598,12 +600,10 @@ extern void GameAgent_EnumTrigger(BOOL bInternet)
     _bServer = FALSE;
     _pNetwork->ga_strEnumerationStatus = ".";
 
-	WORD     _wsaRequested;
-	WSADATA  wsaData;
 	PHOSTENT _phHostinfo;
 	ULONG    _uIP,*_pchIP = &_uIP;
 	USHORT   _uPort,*_pchPort = &_uPort;
-	INT      _iLen;
+	LONG     _iLen;
 	char     _cName[256],*_pch,_strFinal[8] = {0};
 
 	struct in_addr addr;
@@ -614,8 +614,10 @@ extern void GameAgent_EnumTrigger(BOOL bInternet)
     }
     _szIPPortBufferLocal = new char[1024];
 
+    #ifdef PLATFORM_WIN32
 	// start WSA
-	_wsaRequested = MAKEWORD( 2, 2 );
+	WSADATA  wsaData;
+	const WORD _wsaRequested = MAKEWORD( 2, 2 );
     if( WSAStartup(_wsaRequested, &wsaData) != 0) {
 		CPrintF("Error initializing winsock!\n");
 		if(_szIPPortBufferLocal != NULL) {
@@ -629,6 +631,7 @@ extern void GameAgent_EnumTrigger(BOOL bInternet)
 		WSACleanup();
         return;
     }
+    #endif
 
     _pch = _szIPPortBufferLocal;
 	_iLen = 0;
@@ -691,7 +694,7 @@ extern void GameAgent_EnumTrigger(BOOL bInternet)
 
     struct  sockaddr_in peer;
 
-    SOCKET  _sock               = NULL;
+    SOCKET  _sock               = INVALID_SOCKET;
     u_int   uiMSIP;
     int     iErr,
             iLen,
@@ -704,21 +707,22 @@ extern void GameAgent_EnumTrigger(BOOL bInternet)
             *ucSec               = NULL,
             *ucKey               = NULL;
 
-    char    *cFilter             = "",
+    const char *cFilter             = "";
-            *cWhere              = "",
+    const char *cWhere              = "";
-            cMS[128]             = {0},
+    char cMS[128]             = {0};
-            *cResponse           = NULL,
+    char *cResponse           = NULL;
-            *cMsstring           = NULL,
+    char *cMsstring           = NULL;
-            *cSec                = NULL;
+    char *cSec                = NULL;
-
 
     strcpy(cMS,ga_strMSLegacy);
 
+    #if PLATFORM_WIN32
     WSADATA wsadata;
     if(WSAStartup(MAKEWORD(2,2), &wsadata) != 0) {
         CPrintF("Error initializing winsock!\n");
         return;
     }
+    #endif
 
 /* Open a socket and connect to the Master server */
 
@@ -1024,6 +1028,9 @@ extern void GameAgent_EnumUpdate(void)
     }
   }
  } else {
+ #ifndef PLATFORM_WIN32
+ STUBBED("write me");
+ #else
  /* MSLegacy */
     if(_bActivated) {
         HANDLE  _hThread;
@@ -1045,6 +1052,7 @@ extern void GameAgent_EnumUpdate(void)
         }
         _bActivatedLocal = FALSE;		
     }	
+ #endif
  }
 }
 
@@ -1058,6 +1066,7 @@ extern void GameAgent_EnumCancel(void)
   }
 }
 
+#ifdef PLATFORM_WIN32
 DWORD WINAPI _MS_Thread(LPVOID lpParam) {
     SOCKET _sockudp = NULL;
     struct _sIPPort {
@@ -1468,3 +1477,5 @@ DWORD WINAPI _LocalNet_Thread(LPVOID lpParam) {
     WSACleanup();
     return 0;
 }
+#endif
+

Sources/Engine/GameAgent/MSLegacy.h

@@ -175,7 +175,7 @@ u_int resolv(char *host) {
     if(host_ip == INADDR_NONE) {
         hp = gethostbyname(host);
         if(!hp) {
-            return (NULL);
+            return 0;
         } else host_ip = *(u_int *)(hp->h_addr);
     }
     return(host_ip);

Sources/Engine/Graphics/DrawPort.cpp

@@ -896,7 +896,7 @@ void CDrawPort::FillZBuffer( PIX pixI, PIX pixJ, PIX pixWidth, PIX pixHeight, FL
     HRESULT hr = _pGfx->gl_pd3dDevice->Clear( 1, &d3dRect, D3DCLEAR_ZBUFFER, 0,zval,0);
     D3D_CHECKERROR(hr);
   }
-#endif SE1_D3D
+#endif //SE1_D3D
 }
 
 
@@ -923,7 +923,7 @@ void CDrawPort::FillZBuffer( FLOAT zval) const
     HRESULT hr = _pGfx->gl_pd3dDevice->Clear( 0, NULL, D3DCLEAR_ZBUFFER, 0,zval,0);
     D3D_CHECKERROR(hr);
   }
-#endif SE1_D3D
+#endif //SE1_D3D
 }
 
 

Sources/Engine/Graphics/GfxLibrary.cpp

@@ -1106,10 +1106,10 @@ void CGfxLibrary::Init(void)
 {
   ASSERT( this!=NULL);
 
+#ifdef PLATFORM_WIN32
   // we will never allow glide splash screen
   putenv( "FX_GLIDE_NO_SPLASH=1");
 
-#ifdef PLATFORM_WIN32
   // report desktop settings
   CPrintF(TRANSV("Desktop settings...\n"));
 
@@ -1126,6 +1126,9 @@ void CGfxLibrary::Init(void)
 
 #else
 
+  // we will never allow glide splash screen
+  setenv("FX_GLIDE_NO_SPLASH", "1", 1);
+
   gfx_ctMonitors = 1;
 
 #endif

Sources/Engine/Graphics/TextureEffects.h

@@ -94,14 +94,14 @@ public:
 };
 
 struct TextureEffectSourceType {
-  char *test_strName;    // name used for browsing
+  const char *test_strName;    // name used for browsing
   void (*test_Initialize)(CTextureEffectSource *ptes,
     PIX pixU0, PIX pixV0, PIX pixU1, PIX pixV1);   // function for initalization of a new effect source
   void (*test_Animate)(CTextureEffectSource *ptes);   // function for animation of one effect source
 };
 
 struct TextureEffectGlobalType {
-  char *tegt_strName;    // name used for browsing
+  const char *tegt_strName;    // name used for browsing
   void (*tegt_Initialize)(void);
   void (*tegt_Animate)(void);
 

Sources/Engine/Math/ObjectSector.cpp

@@ -825,7 +825,7 @@ bug:
 
 skipbug:;
 #endif //NDEBUG
-#endif 0
+#endif //0
 }
 
 /*

Sources/Engine/Sound/Wave.cpp

@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
  */
 
 // check wave format
-void PCMWaveInput::CheckWaveFormat_t(WAVEFORMATEX wfeCheck, char *pcErrorString)
+void PCMWaveInput::CheckWaveFormat_t(WAVEFORMATEX wfeCheck, const char *pcErrorString)
 {
   // check format tag
   if (wfeCheck.wFormatTag != 1) {

Sources/Engine/Sound/Wave.h

@@ -41,7 +41,7 @@ private:
 
 public:
   // Check wave format
-  static void CheckWaveFormat_t( WAVEFORMATEX SwfeCheck, char *pcErrorString);
+  static void CheckWaveFormat_t( WAVEFORMATEX SwfeCheck, const char *pcErrorString);
 
   /* Constructor */
   inline PCMWaveInput(void) { pwi_bInfoLoaded = FALSE; pwi_bDataLoaded = FALSE; };

Sources/EntitiesMP/Player.es

@@ -3191,7 +3191,7 @@ functions:
       if (GetFlags()&ENF_ALIVE) {
         // determine corresponding sound
         INDEX iSound;
-        char *strIFeel = NULL;
+        const char *strIFeel = NULL;
         if( m_fDamageAmmount<5.0f) {
           iSound = GenderSound(SOUND_WOUNDWEAK);
           strIFeel = "WoundWeak";

Sources/GameMP/Game.cpp

@@ -167,7 +167,7 @@ static INDEX ctl_iCurrentPlayerLocal = -1;
 static INDEX ctl_iCurrentPlayer = -1;
 static FLOAT gam_fChatSoundVolume = 0.25f;
 
-extern BOOL map_bIsFirstEncounter = FALSE;
+BOOL map_bIsFirstEncounter = FALSE;
 BOOL _bUserBreakEnabled = FALSE;
 
 // make sure that console doesn't show last lines if not playing in network
@@ -353,7 +353,7 @@ CButtonAction::CButtonAction(void)
 }
 
 // Assignment operator.
-CButtonAction &CButtonAction ::operator=(CButtonAction &baOriginal)
+CButtonAction &CButtonAction ::operator=(const CButtonAction &baOriginal)
 {
   ba_iFirstKey                  = baOriginal.ba_iFirstKey;
   ba_iSecondKey                 = baOriginal.ba_iSecondKey;
@@ -504,7 +504,12 @@ void CControls::RemoveButtonAction( CButtonAction &baButtonAction)
   delete &baButtonAction;
 }
 
-
+void CControls::DeleteAllButtonActions()
+{
+  FORDELETELIST(CButtonAction, ba_lnNode, this->ctrl_lhButtonActions, itAct) {
+    delete &itAct.Current();
+  }
+}
 
 // calculate some useful demo vars
 static void CalcDemoProfile( INDEX ctFrames, INDEX &ctFramesNoPeaks,
@@ -2867,7 +2872,7 @@ void CGame::LCDSetDrawport(CDrawPort *pdp)
   
   ::_LCDSetDrawport(pdp);
 }
-void CGame::LCDDrawBox(PIX pixUL, PIX pixDR, PIXaabbox2D &box, COLOR col)
+void CGame::LCDDrawBox(PIX pixUL, PIX pixDR, const PIXaabbox2D &box, COLOR col)
 {
   col = SE_COL_BLUE_NEUTRAL|255;
 

Sources/GameMP/Game.h

@@ -76,6 +76,7 @@ class CButtonAction {
 public:
   // default constructor
   CButtonAction();
+  ~CButtonAction() {}
   CListNode ba_lnNode;
   INDEX ba_iFirstKey;
   BOOL ba_bFirstKeyDown;
@@ -85,7 +86,7 @@ public:
   CTString ba_strCommandLineWhenPressed;
   CTString ba_strCommandLineWhenReleased;
   // Assignment operator.
-  virtual CButtonAction &operator=(CButtonAction &baOriginal);
+  virtual CButtonAction &operator=(const CButtonAction &baOriginal);
   virtual void Read_t( CTStream &istrm);    // throw char*
   virtual void Write_t( CTStream &ostrm);    // throw char*
 };
@@ -126,6 +127,7 @@ public:
   virtual void RemoveButtonAction( CButtonAction &baButtonAction);
   virtual void Load_t( CTFileName fnFile); // throw char *
   virtual void Save_t( CTFileName fnFile); // throw char *
+  virtual void DeleteAllButtonActions();
 };
 
 class CLocalPlayer
@@ -296,7 +298,7 @@ public:
   virtual void LCDEnd(void);
   virtual void LCDPrepare(FLOAT fFade);
   virtual void LCDSetDrawport(CDrawPort *pdp);
-  virtual void LCDDrawBox(PIX pixUL, PIX pixDR, PIXaabbox2D &box, COLOR col);
+  virtual void LCDDrawBox(PIX pixUL, PIX pixDR, const PIXaabbox2D &box, COLOR col);
   virtual void LCDScreenBox(COLOR col);
   virtual void LCDScreenBoxOpenLeft(COLOR col);
   virtual void LCDScreenBoxOpenRight(COLOR col);

Sources/GameMP/LCDDrawing.cpp

@@ -69,7 +69,7 @@ void TiledTexture( PIXaabbox2D &_boxScreen, FLOAT fStretch, const MEX2D &vScreen
   boxTexture+=vScreen;
 }
 
-extern void _LCDDrawBox(PIX pixUL, PIX pixDR, PIXaabbox2D &box, COLOR col)
+extern void _LCDDrawBox(PIX pixUL, PIX pixDR, const PIXaabbox2D &box, COLOR col)
 {
   // up
   _pdp->DrawLine(

Sources/GameMP/LCDDrawing.h

@@ -23,7 +23,7 @@ extern void _LCDInit(void);
 extern void _LCDEnd(void);
 extern void _LCDPrepare(FLOAT fFade);
 extern void _LCDSetDrawport(CDrawPort *pdp);
-extern void _LCDDrawBox(PIX pixUL, PIX pixDR, PIXaabbox2D &box, COLOR col);
+extern void _LCDDrawBox(PIX pixUL, PIX pixDR, const PIXaabbox2D &box, COLOR col);
 extern void _LCDScreenBox(COLOR col);
 extern void _LCDScreenBoxOpenLeft(COLOR col);
 extern void _LCDScreenBoxOpenRight(COLOR col);

Sources/SeriousSam/FileInfo.h

@@ -29,3 +29,4 @@ public:
 
 
 #endif  /* include-once check. */
+

Sources/SeriousSam/GUI/Components/MGArrow.cpp

@@ -13,11 +13,11 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
-#include "MGArrow.h"
+#include "SeriousSam/GUI/Components/MGArrow.h"
 
 
 void CMGArrow::Render(CDrawPort *pdp)

Sources/SeriousSam/GUI/Components/MGArrow.h

@@ -19,8 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "ArrowDir.h"
+#include "SeriousSam/ArrowDir.h"
-#include "MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
 
 
 class CMGArrow : public CMGButton {

Sources/SeriousSam/GUI/Components/MGButton.cpp

@@ -13,13 +13,13 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
-#include "LevelInfo.h"
+#include "SeriousSam/LevelInfo.h"
-#include "VarList.h"
+#include "SeriousSam/VarList.h"
-#include "MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
 
 extern CSoundData *_psdPress;
 
@@ -74,14 +74,14 @@ void CMGButton::Render(CDrawPort *pdp)
 	PIXaabbox2D box = FloatBoxToPixBox(pdp, mg_boxOnScreen);
 	COLOR col = GetCurrentColor();
 	if (mg_bEditing) {
-		col = LCDGetColor(C_GREEN | 0xFF, "editing");
+		col = _pGame->LCDGetColor(C_GREEN | 0xFF, "editing");
 	}
 
 	COLOR colRectangle = col;
 	if (mg_bHighlighted) {
-		col = LCDGetColor(C_WHITE | 0xFF, "hilited");
+		col = _pGame->LCDGetColor(C_WHITE | 0xFF, "hilited");
 		if (!mg_bFocused) {
-			colRectangle = LCDGetColor(C_WHITE | 0xFF, "hilited rectangle");
+			colRectangle = _pGame->LCDGetColor(C_WHITE | 0xFF, "hilited rectangle");
 		}
 	}
 	if (mg_bMental) {
@@ -119,7 +119,7 @@ void CMGButton::Render(CDrawPort *pdp)
 			pixLeft = box.Min()(1) + box.Size()(1)*0.55f;
 			pixWidth = box.Size()(1)*0.45f + 1;
 		}
-		pdp->Fill(pixLeft, pixUp, pixWidth, pixHeight, LCDGetColor(C_dGREEN | 0x40, "edit fill"));
+		pdp->Fill(pixLeft, pixUp, pixWidth, pixHeight, _pGame->LCDGetColor(C_dGREEN | 0x40, "edit fill"));
 	}
 
 
@@ -163,7 +163,7 @@ void CMGButton::Render(CDrawPort *pdp)
 		if (!pdp->dp_FontData->fd_bFixedWidth) {
 			pixY -= pdp->dp_fTextScaling * 2;
 		}
-		pdp->PutText("|", pixX, pixY, LCDGetColor(C_WHITE | 0xFF, "editing cursor"));
+		pdp->PutText("|", pixX, pixY, _pGame->LCDGetColor(C_WHITE | 0xFF, "editing cursor"));
 	}
 }
 

Sources/SeriousSam/GUI/Components/MGButton.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "MenuGadget.h"
+#include "SeriousSam/GUI/Components/MenuGadget.h"
 
 
 class CMGButton : public CMenuGadget {

Sources/SeriousSam/GUI/Components/MGChangePlayer.cpp

@@ -13,12 +13,12 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
-#include "MGChangePlayer.h"
+#include "SeriousSam/GUI/Components/MGChangePlayer.h"
-#include "GUI/Menus/MenuManager.h"
+#include "SeriousSam/GUI/Menus/MenuManager.h"
 
 extern CSoundData *_psdPress;
 
@@ -48,6 +48,6 @@ void CMGChangePlayer::SetPlayerText(void)
   if (iPlayer<0 || iPlayer>7) {
     mg_strText = "????";
   } else {
-    mg_strText.PrintF(TRANS("Player %d: %s\n"), mg_iLocalPlayer + 1, pc.GetNameForPrinting());
+    mg_strText.PrintF(TRANS("Player %d: %s\n"), mg_iLocalPlayer + 1, (const char *) pc.GetNameForPrinting());
   }
 }

Sources/SeriousSam/GUI/Components/MGChangePlayer.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
 
 
 class CMGChangePlayer : public CMGButton {

Sources/SeriousSam/GUI/Components/MGEdit.cpp

@@ -13,11 +13,11 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
-#include "MGEdit.h"
+#include "SeriousSam/GUI/Components/MGEdit.h"
 
 extern CSoundData *_psdPress;
 

Sources/SeriousSam/GUI/Components/MGEdit.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
 
 
 class CMGEdit : public CMGButton {

Sources/SeriousSam/GUI/Components/MGFileButton.cpp

@@ -13,12 +13,12 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
-#include "MGFileButton.h"
+#include "SeriousSam/GUI/Components/MGFileButton.h"
-#include "GUI/Menus/MenuManager.h"
+#include "SeriousSam/GUI/Menus/MenuManager.h"
 
 extern CSoundData *_psdPress;
 
@@ -237,7 +237,7 @@ void CMGFileButton::Render(CDrawPort *pdp)
     PIX pixI = box.Min()(1);
     PIX pixJ = box.Min()(2);
 
-    COLOR col = LCDGetColor(C_mlGREEN | 255, "file info");
+    COLOR col = _pGame->LCDGetColor(C_mlGREEN | 255, "file info");
     pdp->PutText(mg_strInfo, pixI, pixJ, col);
   }
 }

Sources/SeriousSam/GUI/Components/MGFileButton.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "MGEdit.h"
+#include "SeriousSam/GUI/Components/MGEdit.h"
 
 // file button states
 #define FBS_NORMAL    0 // normal active state

Sources/SeriousSam/GUI/Components/MGHighScore.cpp

@@ -13,11 +13,11 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
-#include "MGHighScore.h"
+#include "SeriousSam/GUI/Components/MGHighScore.h"
 
 #define HSCOLUMNS 6
 CTString strHighScores[HIGHSCORE_COUNT + 1][HSCOLUMNS];
@@ -30,9 +30,9 @@ void CMGHighScore::Render(CDrawPort *pdp)
 {
   SetFontMedium(pdp);
 
-  COLOR colHeader = LCDGetColor(C_GREEN | 255, "hiscore header");
+  COLOR colHeader = _pGame->LCDGetColor(C_GREEN | 255, "hiscore header");
-  COLOR colData = LCDGetColor(C_mdGREEN | 255, "hiscore data");
+  COLOR colData = _pGame->LCDGetColor(C_mdGREEN | 255, "hiscore data");
-  COLOR colLastSet = LCDGetColor(C_mlGREEN | 255, "hiscore last set");
+  COLOR colLastSet = _pGame->LCDGetColor(C_mlGREEN | 255, "hiscore last set");
   INDEX iLastSet = _pGame->gm_iLastSetHighScore;
 
   CTString strText;

Sources/SeriousSam/GUI/Components/MGHighScore.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "MenuGadget.h"
+#include "SeriousSam/GUI/Components/MenuGadget.h"
 
 
 class CMGHighScore : public CMenuGadget {

Sources/SeriousSam/GUI/Components/MGKeyDefinition.cpp

@@ -13,11 +13,11 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
-#include "MGKeyDefinition.h"
+#include "SeriousSam/GUI/Components/MGKeyDefinition.h"
 
 extern CSoundData *_psdSelect;
 extern CSoundData *_psdPress;
@@ -63,7 +63,7 @@ void CMGKeyDefinition::SetBindingNames(BOOL bDefining)
   // find the button
   INDEX ict = 0;
   INDEX iDik = 0;
-  FOREACHINLIST(CButtonAction, ba_lnNode, _pGame->gm_ctrlControlsExtra.ctrl_lhButtonActions, itba) {
+  FOREACHINLIST(CButtonAction, ba_lnNode, _pGame->gm_ctrlControlsExtra->ctrl_lhButtonActions, itba) {
     if (ict == mg_iControlNumber) {
       CButtonAction &ba = *itba;
       // get the current bindings and names
@@ -122,7 +122,7 @@ void CMGKeyDefinition::DefineKey(INDEX iDik)
 {
   // for each button in controls
   INDEX ict = 0;
-  FOREACHINLIST(CButtonAction, ba_lnNode, _pGame->gm_ctrlControlsExtra.ctrl_lhButtonActions, itba) {
+  FOREACHINLIST(CButtonAction, ba_lnNode, _pGame->gm_ctrlControlsExtra->ctrl_lhButtonActions, itba) {
     CButtonAction &ba = *itba;
     // if it is this one
     if (ict == mg_iControlNumber) {

Sources/SeriousSam/GUI/Components/MGKeyDefinition.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "MenuGadget.h"
+#include "SeriousSam/GUI/Components/MenuGadget.h"
 
 
 class CMGKeyDefinition : public CMenuGadget {

Sources/SeriousSam/GUI/Components/MGLevelButton.cpp

@@ -13,11 +13,11 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
-#include "MGLevelButton.h"
+#include "SeriousSam/GUI/Components/MGLevelButton.h"
 
 extern CSoundData *_psdPress;
 

Sources/SeriousSam/GUI/Components/MGLevelButton.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
 
 
 class CMGLevelButton : public CMGButton {

Sources/SeriousSam/GUI/Components/MGModel.cpp

@@ -13,11 +13,11 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
-#include "MGModel.h"
+#include "SeriousSam/GUI/Components/MGModel.h"
 
 extern INDEX sam_bWideScreen;
 
@@ -43,11 +43,11 @@ void CMGModel::Render(CDrawPort *pdp)
   dpModel.Lock();
   dpModel.FillZBuffer(1.0f);
 
-  LCDSetDrawport(&dpModel);
+  _pGame->LCDSetDrawport(&dpModel);
   // clear menu here
   dpModel.Fill(C_BLACK | 255);
-  LCDRenderClouds1();
+  _pGame->LCDRenderClouds1();
-  LCDRenderClouds2();
+  _pGame->LCDRenderClouds2();
 
   // prepare projection
   CRenderModel rmRenderModel;
@@ -106,13 +106,13 @@ void CMGModel::Render(CDrawPort *pdp)
   mg_moModel.RenderModel(rmRenderModel);
   EndModelRenderingView();
 
-  LCDScreenBox(LCDGetColor(C_GREEN, "model box") | GetCurrentColor());
+  _pGame->LCDScreenBox(_pGame->LCDGetColor(C_GREEN, "model box") | GetCurrentColor());
 
   dpModel.Unlock();
 
   pdp->Unlock();
   pdp->Lock();
-  LCDSetDrawport(pdp);
+  _pGame->LCDSetDrawport(pdp);
 
   // print the model name
   {

Sources/SeriousSam/GUI/Components/MGModel.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
 
 
 class CMGModel : public CMGButton {

Sources/SeriousSam/GUI/Components/MGServerList.cpp

@@ -13,12 +13,12 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
 #include "MGServerList.h"
-#include "MGEdit.h"
+#include "SeriousSam/GUI/Components/MGEdit.h"
 
 extern CSoundData *_psdSelect;
 extern CSoundData *_psdPress;

Sources/SeriousSam/GUI/Components/MGServerList.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
 
 
 class CMGServerList : public CMGButton {

Sources/SeriousSam/GUI/Components/MGSlider.cpp

@@ -13,11 +13,11 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
-#include "MGSlider.h"
+#include "SeriousSam/GUI/Components/MGSlider.h"
 
 extern PIX  _pixCursorPosI;
 extern PIX  _pixCursorPosJ;
@@ -113,8 +113,8 @@ void CMGSlider::Render(CDrawPort *pdp)
   pdp->PutTextR(mg_strText, pixIL, pixJ, col);
 
   // draw box around slider
-  LCDDrawBox(0, -1, PIXaabbox2D(PIX2D(pixIR + 1, pixJ), PIX2D(pixIR + pixISizeR - 2, pixJ + pixJSize - 2)),
+  _pGame->LCDDrawBox(0, -1, PIXaabbox2D(PIX2D(pixIR + 1, pixJ), PIX2D(pixIR + pixISizeR - 2, pixJ + pixJSize - 2)),
-    LCDGetColor(C_GREEN | 255, "slider box"));
+    _pGame->LCDGetColor(C_GREEN | 255, "slider box"));
 
   // draw filled part of slider
   pdp->Fill(pixIR + 2, pixJ + 1, (pixISizeR - 5)*mg_fFactor, (pixJSize - 4), col);

Sources/SeriousSam/GUI/Components/MGSlider.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
 
 
 class CMGSlider : public CMGButton {

Sources/SeriousSam/GUI/Components/MGTitle.cpp

@@ -13,11 +13,11 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
-#include "MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
 
 
 void CMGTitle::Render(CDrawPort *pdp)
@@ -28,5 +28,5 @@ void CMGTitle::Render(CDrawPort *pdp)
   PIX pixI = box.Center()(1);
   PIX pixJ = box.Min()(2);
 
-  pdp->PutTextC(mg_strText, pixI, pixJ, LCDGetColor(C_WHITE | CT_OPAQUE, "title"));
+  pdp->PutTextC(mg_strText, pixI, pixJ, _pGame->LCDGetColor(C_WHITE | CT_OPAQUE, "title"));
 }

Sources/SeriousSam/GUI/Components/MGTitle.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "MenuGadget.h"
+#include "SeriousSam/GUI/Components/MenuGadget.h"
 
 
 class CMGTitle : public CMenuGadget {

Sources/SeriousSam/GUI/Components/MGTrigger.cpp

@@ -13,11 +13,11 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
-#include "MGTrigger.h"
+#include "SeriousSam/GUI/Components/MGTrigger.h"
 
 
 INDEX GetNewLoopValue(int iVKey, INDEX iCurrent, INDEX ctMembers)

Sources/SeriousSam/GUI/Components/MGTrigger.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "MenuGadget.h"
+#include "SeriousSam/GUI/Components/MenuGadget.h"
 
 
 class CMGTrigger : public CMenuGadget {

Sources/SeriousSam/GUI/Components/MGVarButton.cpp

@@ -13,12 +13,12 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
-#include "VarList.h"
+#include "SeriousSam/VarList.h"
-#include "MGVarButton.h"
+#include "SeriousSam/GUI/Components/MGVarButton.h"
 
 extern PIX  _pixCursorPosI;
 extern PIX  _pixCursorPosJ;
@@ -139,7 +139,7 @@ void CMGVarButton::Render(CDrawPort *pdp)
   if (mg_pvsVar->vs_bSeparator)
   {
     mg_bEnabled = FALSE;
-    COLOR col = LCDGetColor(C_WHITE | 255, "separator");
+    COLOR col = _pGame->LCDGetColor(C_WHITE | 255, "separator");
     CTString strText = mg_pvsVar->vs_strName;
     pdp->PutTextC(strText, pixIC, pixJ, col);
   } else if (mg_pvsVar->Validate()) {
@@ -157,8 +157,8 @@ void CMGVarButton::Render(CDrawPort *pdp)
         // draw box around slider
         PIX pixISize = box.Size()(1)*0.13f;
         PIX pixJSize = box.Size()(2);
-        LCDDrawBox(0, -1, PIXaabbox2D(PIX2D(pixIR, pixJ + 1), PIX2D(pixIR + pixISize - 4, pixJ + pixJSize - 6)),
+        _pGame->LCDDrawBox(0, -1, PIXaabbox2D(PIX2D(pixIR, pixJ + 1), PIX2D(pixIR + pixISize - 4, pixJ + pixJSize - 6)),
-          LCDGetColor(C_GREEN | 255, "slider box"));
+          _pGame->LCDGetColor(C_GREEN | 255, "slider box"));
 
         // draw filled part of slider
         if (mg_pvsVar->vs_iSlider == 1) {

Sources/SeriousSam/GUI/Components/MGVarButton.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
 
 
 class CMGVarButton : public CMGButton {

Sources/SeriousSam/GUI/Components/MenuGadget.cpp

@@ -13,19 +13,19 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
 #include <GameMP/LCDDrawing.h>
-#include "LevelInfo.h"
+#include "SeriousSam/LevelInfo.h"
-#include "VarList.h"
+#include "SeriousSam/VarList.h"
-#include "MenuGadget.h"
+#include "SeriousSam/GUI/Components/MenuGadget.h"
 
 extern CSoundData *_psdSelect;
 
-extern BOOL _bDefiningKey = FALSE;
+BOOL _bDefiningKey = FALSE;
-extern BOOL _bEditingString = FALSE;
+BOOL _bEditingString = FALSE;
-extern CMenuGadget *_pmgLastActivatedGadget = NULL;
+CMenuGadget *_pmgLastActivatedGadget = NULL;
 
 
 CMenuGadget::CMenuGadget(void)
@@ -107,17 +107,17 @@ void CMenuGadget::OnMouseOver(PIX pixI, PIX pixJ)
 COLOR CMenuGadget::GetCurrentColor(void)
 {
   // use normal colors
-  COLOR colUnselected = LCDGetColor(C_GREEN, "unselected");
+  COLOR colUnselected = _pGame->LCDGetColor(C_GREEN, "unselected");
-  COLOR colSelected = LCDGetColor(C_WHITE, "selected");
+  COLOR colSelected = _pGame->LCDGetColor(C_WHITE, "selected");
   // if disabled
   if (!mg_bEnabled) {
     // use a bit darker colors
-    colUnselected = LCDGetColor(C_dGREEN, "disabled unselected");
+    colUnselected = _pGame->LCDGetColor(C_dGREEN, "disabled unselected");
-    colSelected = LCDGetColor(C_GRAY, "disabled selected");
+    colSelected = _pGame->LCDGetColor(C_GRAY, "disabled selected");
     // if label
     if (mg_bLabel) {
       // use white
-      colUnselected = colSelected = LCDGetColor(C_WHITE, "label");
+      colUnselected = colSelected = _pGame->LCDGetColor(C_WHITE, "label");
     }
   }
   // use unselected color

Sources/SeriousSam/GUI/Components/MenuGadget.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 
 #define DOING_NOTHING 0
 #define PRESS_KEY_WAITING 1

Sources/SeriousSam/GUI/Menus/GameMenu.cpp

@@ -13,10 +13,10 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
 
 
 CGameMenu::CGameMenu(void)

Sources/SeriousSam/GUI/Menus/MAudioOptions.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MenuStuff.h"
 #include "MAudioOptions.h"
 

Sources/SeriousSam/GUI/Menus/MAudioOptions.h

@@ -19,11 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
-#include "GUI/Components/MGSlider.h"
+#include "SeriousSam/GUI/Components/MGSlider.h"
-#include "GUI/Components/MGTrigger.h"
+#include "SeriousSam/GUI/Components/MGTrigger.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
 
 
 class CAudioOptionsMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MConfirm.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MConfirm.h"
 
 void CConfirmMenu::Initialize_t(void)

Sources/SeriousSam/GUI/Menus/MConfirm.h

@@ -19,8 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
 
 
 class CConfirmMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MControls.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MenuStuff.h"
 #include "MControls.h"
 
@@ -99,7 +99,7 @@ void CControlsMenu::StartMenu(void)
 
   ControlsMenuOn();
 
-  gm_mgNameLabel.mg_strText.PrintF(TRANS("CONTROLS FOR: %s"), _pGame->gm_apcPlayers[iPlayer].GetNameForPrinting());
+  gm_mgNameLabel.mg_strText.PrintF(TRANS("CONTROLS FOR: %s"), (const char *) _pGame->gm_apcPlayers[iPlayer].GetNameForPrinting());
 
   ObtainActionSettings();
   CGameMenu::StartMenu();
@@ -116,7 +116,7 @@ void CControlsMenu::EndMenu(void)
 
 void CControlsMenu::ObtainActionSettings(void)
 {
-  CControls &ctrls = _pGame->gm_ctrlControlsExtra;
+  CControls &ctrls = *_pGame->gm_ctrlControlsExtra;
 
   gm_mgSensitivity.mg_iMinPos = 0;
   gm_mgSensitivity.mg_iMaxPos = 50;
@@ -137,7 +137,7 @@ void CControlsMenu::ObtainActionSettings(void)
 
 void CControlsMenu::ApplyActionSettings(void)
 {
-  CControls &ctrls = _pGame->gm_ctrlControlsExtra;
+  CControls &ctrls = *_pGame->gm_ctrlControlsExtra;
 
   FLOAT fSensitivity =
     FLOAT(gm_mgSensitivity.mg_iCurPos - gm_mgSensitivity.mg_iMinPos) /

Sources/SeriousSam/GUI/Menus/MControls.h

@@ -19,11 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
-#include "GUI/Components/MGSlider.h"
+#include "SeriousSam/GUI/Components/MGSlider.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
-#include "GUI/Components/MGTrigger.h"
+#include "SeriousSam/GUI/Components/MGTrigger.h"
 
 
 class CControlsMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MCredits.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
 
 
 class CCreditsMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MCustomizeAxis.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MenuStuff.h"
 #include "MCustomizeAxis.h"
 
@@ -84,7 +84,7 @@ CCustomizeAxisMenu::~CCustomizeAxisMenu(void)
 void CCustomizeAxisMenu::ObtainActionSettings(void)
 {
   ControlsMenuOn();
-  CControls &ctrls = _pGame->gm_ctrlControlsExtra;
+  CControls &ctrls = *_pGame->gm_ctrlControlsExtra;
   INDEX iSelectedAction = gm_mgActionTrigger.mg_iSelected;
   INDEX iMountedAxis = ctrls.ctrl_aaAxisActions[iSelectedAction].aa_iAxisAction;
 
@@ -113,7 +113,7 @@ void CCustomizeAxisMenu::ObtainActionSettings(void)
 
 void CCustomizeAxisMenu::ApplyActionSettings(void)
 {
-  CControls &ctrls = _pGame->gm_ctrlControlsExtra;
+  CControls &ctrls = *_pGame->gm_ctrlControlsExtra;
   INDEX iSelectedAction = gm_mgActionTrigger.mg_iSelected;
   INDEX iMountedAxis = gm_mgMountedTrigger.mg_iSelected;
   FLOAT fSensitivity =

Sources/SeriousSam/GUI/Menus/MCustomizeAxis.h

@@ -19,10 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGSlider.h"
+#include "SeriousSam/GUI/Components/MGSlider.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
-#include "GUI/Components/MGTrigger.h"
+#include "SeriousSam/GUI/Components/MGTrigger.h"
 
 
 class CCustomizeAxisMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MCustomizeKeyboard.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MenuStuff.h"
 #include "MCustomizeKeyboard.h"
 
@@ -32,8 +32,8 @@ void CCustomizeKeyboardMenu::FillListItems(void)
   BOOL bHasLast = FALSE;
   // set diks to key buttons
   INDEX iLabel = 0;
-  INDEX ctLabels = _pGame->gm_ctrlControlsExtra.ctrl_lhButtonActions.Count();
+  INDEX ctLabels = _pGame->gm_ctrlControlsExtra->ctrl_lhButtonActions.Count();
-  FOREACHINLIST(CButtonAction, ba_lnNode, _pGame->gm_ctrlControlsExtra.ctrl_lhButtonActions, itAct)
+  FOREACHINLIST(CButtonAction, ba_lnNode, _pGame->gm_ctrlControlsExtra->ctrl_lhButtonActions, itAct)
   {
     INDEX iInMenu = iLabel - gm_iListOffset;
     if ((iLabel >= gm_iListOffset) &&
@@ -100,7 +100,7 @@ void CCustomizeKeyboardMenu::StartMenu(void)
 {
   ControlsMenuOn();
   gm_iListOffset = 0;
-  gm_ctListTotal = _pGame->gm_ctrlControlsExtra.ctrl_lhButtonActions.Count();
+  gm_ctListTotal = _pGame->gm_ctrlControlsExtra->ctrl_lhButtonActions.Count();
   gm_iListWantedItem = 0;
   CGameMenu::StartMenu();
 }

Sources/SeriousSam/GUI/Menus/MCustomizeKeyboard.h

@@ -19,10 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGArrow.h"
+#include "SeriousSam/GUI/Components/MGArrow.h"
-#include "GUI/Components/MGKeyDefinition.h"
+#include "SeriousSam/GUI/Components/MGKeyDefinition.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
 
 
 class CCustomizeKeyboardMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MDisabled.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MDisabled.h"
 
 

Sources/SeriousSam/GUI/Menus/MDisabled.h

@@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
 
 
 class CDisabledMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MHighScore.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MHighScore.h"
 
 

Sources/SeriousSam/GUI/Menus/MHighScore.h

@@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGHighScore.h"
+#include "SeriousSam/GUI/Components/MGHighScore.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
 
 
 class CHighScoreMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MInGame.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MInGame.h"
 
 
@@ -136,7 +136,7 @@ void CInGameMenu::StartMenu(void)
 
   if (_gmRunningGameMode == GM_SINGLE_PLAYER) {
     CPlayerCharacter &pc = _pGame->gm_apcPlayers[_pGame->gm_iSinglePlayer];
-    gm_mgLabel1.mg_strText.PrintF(TRANS("Player: %s"), pc.GetNameForPrinting());
+    gm_mgLabel1.mg_strText.PrintF(TRANS("Player: %s"), (const char *) pc.GetNameForPrinting());
     gm_mgLabel2.mg_strText = "";
 
   } else {

Sources/SeriousSam/GUI/Menus/MInGame.h

@@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
 
 
 class CInGameMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MLevels.cpp

@@ -13,10 +13,10 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
-#include "LevelInfo.h"
+#include "SeriousSam/LevelInfo.h"
 #include "MLevels.h"
 
 

Sources/SeriousSam/GUI/Menus/MLevels.h

@@ -19,10 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGArrow.h"
+#include "SeriousSam/GUI/Components/MGArrow.h"
-#include "GUI/Components/MGLevelButton.h"
+#include "SeriousSam/GUI/Components/MGLevelButton.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
 
 
 class CLevelsMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MLoadSave.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MenuStuff.h"
 #include "MLoadSave.h"
 
@@ -74,7 +74,7 @@ void CLoadSaveMenu::StartMenu(void)
 
   // list the directory
   CDynamicStackArray<CTFileName> afnmDir;
-  MakeDirList(afnmDir, gm_fnmDirectory, "", 0);
+  MakeDirList(afnmDir, gm_fnmDirectory, CTString(""), 0);
   gm_iLastFile = -1;
 
   // for each file in the directory
@@ -222,7 +222,7 @@ BOOL CLoadSaveMenu::ParseFile(const CTFileName &fnm, CTString &strName)
       INDEX iCtl = -1;
       strName.ScanF("Controls%d", &iCtl);
       if (iCtl >= 0 && iCtl <= 7) {
-        strName.PrintF(TRANS("From player: %s"), _pGame->gm_apcPlayers[iCtl].GetNameForPrinting());
+        strName.PrintF(TRANS("From player: %s"), (const char *) _pGame->gm_apcPlayers[iCtl].GetNameForPrinting());
       }
     }
   }

Sources/SeriousSam/GUI/Menus/MLoadSave.h

@@ -19,11 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGArrow.h"
+#include "SeriousSam/GUI/Components/MGArrow.h"
-#include "GUI/Components/MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
-#include "GUI/Components/MGFileButton.h"
+#include "SeriousSam/GUI/Components/MGFileButton.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
 
 #define SAVELOAD_BUTTONS_CT 14
 

Sources/SeriousSam/GUI/Menus/MMain.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MenuStuff.h"
 #include "MMain.h"
 

Sources/SeriousSam/GUI/Menus/MMain.h

@@ -19,8 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
 
 
 class CMainMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MNetwork.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MNetwork.h"
 
 

Sources/SeriousSam/GUI/Menus/MNetwork.h

@@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
 
 
 class CNetworkMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MNetworkJoin.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MenuStuff.h"
 #include "MNetworkJoin.h"
 

Sources/SeriousSam/GUI/Menus/MNetworkJoin.h

@@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
 
 
 class CNetworkJoinMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MNetworkOpen.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MenuStuff.h"
 #include "MNetworkOpen.h"
 

Sources/SeriousSam/GUI/Menus/MNetworkOpen.h

@@ -19,10 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
-#include "GUI/Components/MGEdit.h"
+#include "SeriousSam/GUI/Components/MGEdit.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
 
 
 class CNetworkOpenMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MNetworkStart.cpp

@@ -13,10 +13,10 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
-#include "LevelInfo.h"
+#include "SeriousSam/LevelInfo.h"
 #include "MenuStuff.h"
 #include "MNetworkStart.h"
 

Sources/SeriousSam/GUI/Menus/MNetworkStart.h

@@ -19,11 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
-#include "GUI/Components/MGEdit.h"
+#include "SeriousSam/GUI/Components/MGEdit.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
-#include "GUI/Components/MGTrigger.h"
+#include "SeriousSam/GUI/Components/MGTrigger.h"
 
 
 class CNetworkStartMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MOptions.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MOptions.h"
 
 

Sources/SeriousSam/GUI/Menus/MOptions.h

@@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
 
 
 class COptionsMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MPlayerProfile.cpp

@@ -13,12 +13,12 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MenuStuff.h"
 #include "MPlayerProfile.h"
-#include "GUI/Menus/MenuManager.h"
+#include "SeriousSam/GUI/Menus/MenuManager.h"
 
 #define ADD_SELECT_PLAYER_MG( index, mg, mgprev, mgnext, me)\
   mg.mg_iIndex = index; \
@@ -70,7 +70,7 @@ void CPlayerProfileMenu::Initialize_t(void)
   gm_lhGadgets.AddTail(gm_mgNameLabel.mg_lnNode);
 
   // setup of player name button is done on start menu
-  gm_mgNameField.mg_strText = "<???>";
+  gm_mgNameField.mg_strText = "<\?\?\?>";
   gm_mgNameField.mg_ctMaxStringLen = 25;
   gm_mgNameField.mg_boxOnScreen = BoxPlayerEdit(1.25);
   gm_mgNameField.mg_bfsFontSize = BFS_MEDIUM;
@@ -88,7 +88,7 @@ void CPlayerProfileMenu::Initialize_t(void)
   gm_lhGadgets.AddTail(gm_mgTeamLabel.mg_lnNode);
 
   // setup of player name button is done on start menu
-  gm_mgTeam.mg_strText = "<???>";
+  gm_mgTeam.mg_strText = "<\?\?\?>";
   gm_mgTeam.mg_ctMaxStringLen = 25;
   gm_mgTeam.mg_boxOnScreen = BoxPlayerEdit(2.25f);
   gm_mgTeam.mg_bfsFontSize = BFS_MEDIUM;

Sources/SeriousSam/GUI/Menus/MPlayerProfile.h

@@ -19,12 +19,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
-#include "GUI/Components/MGButton.h"
+#include "SeriousSam/GUI/Components/MGButton.h"
-#include "GUI/Components/MGEdit.h"
+#include "SeriousSam/GUI/Components/MGEdit.h"
-#include "GUI/Components/MGModel.h"
+#include "SeriousSam/GUI/Components/MGModel.h"
-#include "GUI/Components/MGTitle.h"
+#include "SeriousSam/GUI/Components/MGTitle.h"
-#include "GUI/Components/MGTrigger.h"
+#include "SeriousSam/GUI/Components/MGTrigger.h"
 
 
 class CPlayerProfileMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MRenderingOptions.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#include "GameMenu.h"
+#include "SeriousSam/GUI/Menus/GameMenu.h"
 
 
 class CRenderingOptionsMenu : public CGameMenu {

Sources/SeriousSam/GUI/Menus/MSelectPlayers.cpp

@@ -13,9 +13,9 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "StdH.h"
+#include "SeriousSam/StdH.h"
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
+#include "SeriousSam/GUI/Menus/MenuPrinting.h"
 #include "MenuStuff.h"
 #include "MSelectPlayers.h"