q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 18:30:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ryan C. Gordon 2016-04-04 02:34:07 -04:00
parent f9bfaf7435
commit a7e4f8237e
127 changed files with 513 additions and 450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Sources/CMakeLists.txt
View File

@ -69,6 +69,11 @@ if(LINUX OR MACOSX)
#CXXFLAGS += -fexceptions -frtti #CXXFLAGS += -fexceptions -frtti
endif() 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") if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# !!! FIXME: turn a bunch of these off, this is just for now. I hope. --ryan. # !!! FIXME: turn a bunch of these off, this is just for now. I hope. --ryan.
add_definitions(-Wno-unused-value) add_definitions(-Wno-unused-value)
@ -587,13 +592,58 @@ add_executable(SeriousSam
SeriousSam/SeriousSam.cpp SeriousSam/SeriousSam.cpp
SeriousSam/VarList.cpp SeriousSam/VarList.cpp
SeriousSam/Credits.cpp SeriousSam/Credits.cpp
SeriousSam/Menu.cpp
SeriousSam/GLSettings.cpp SeriousSam/GLSettings.cpp
SeriousSam/MenuGadgets.cpp
SeriousSam/LCDDrawing.cpp SeriousSam/LCDDrawing.cpp
SeriousSam/MenuPrinting.cpp
SeriousSam/SplashScreen.cpp SeriousSam/SplashScreen.cpp
SeriousSam/MainWindow.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) add_dependencies(SeriousSam ParseAllEntities)

2
Sources/Ecc/Main.h
View File

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

2
Sources/Ecc/Parser.y
View File

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

8
Sources/Engine/Base/CRCTable.cpp
View File

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

2
Sources/Engine/Base/ErrorReporting.cpp
View File

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

2
Sources/Engine/Base/ErrorReporting.h
View File

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

4
Sources/Engine/Base/ErrorTable.h
View File

@ -21,8 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
struct ErrorCode { struct ErrorCode {
SLONG ec_Code; // error code value 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 { struct ErrorTable {

4
Sources/Engine/Base/IFeel.cpp
View File

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

4
Sources/Engine/Base/IFeel.h
View File

@ -25,8 +25,8 @@ ENGINE_API CTString IFeel_GetProductName();
ENGINE_API CTString IFeel_GetProjectFileName(); ENGINE_API CTString IFeel_GetProjectFileName();
ENGINE_API BOOL IFeel_LoadFile(CTFileName fnFile); ENGINE_API BOOL IFeel_LoadFile(CTFileName fnFile);
ENGINE_API void IFeel_UnLoadFile(); 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); ENGINE_API void IFeel_ChangeGain(FLOAT fGain);
#endif /* include-once check. */ #endif /* include-once check. */

1
Sources/Engine/Base/Memory.cpp
View File

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

7
Sources/Engine/Base/ReplaceFile.cpp
View File

@ -52,7 +52,7 @@ BOOL _bFileReplacingApplied;
extern INDEX wed_bUseBaseForReplacement; 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 #ifdef PLATFORM_WIN32
typedef CTFileName FileRequester_t( typedef CTFileName FileRequester_t(
@ -75,7 +75,8 @@ static CTFileName CallFileRequester(char *achrTitle, char *achrSelectedFile, cha
return CTString(""); 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 #else
@ -86,7 +87,7 @@ static CTFileName CallFileRequester(char *achrTitle, char *achrSelectedFile, cha
} }
BOOL GetReplacingFile(CTFileName fnSourceFile, CTFileName &fnReplacingFile, BOOL GetReplacingFile(CTFileName fnSourceFile, CTFileName &fnReplacingFile,
char *pFilter) const char *pFilter)
{ {
// don't replace files if this console variable is set // don't replace files if this console variable is set
if (!wed_bUseBaseForReplacement) { if (!wed_bUseBaseForReplacement) {

2
Sources/Engine/Base/ReplaceFile.h
View File

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

4
Sources/Engine/Base/SDL/SDLInput.cpp
View File

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

2
Sources/Engine/Base/Stream.cpp
View File

@ -279,7 +279,7 @@ void CTStream::DisableStreamHandling(void)
/* /*
* Throw an exception of formatted string. * 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; const SLONG slBufferSize = 256;
char strFormatBuffer[slBufferSize]; char strFormatBuffer[slBufferSize];

2
Sources/Engine/Base/Stream.h
View File

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

5
Sources/Engine/Base/Translation.cpp
View File

@ -190,10 +190,11 @@ ENGINE_API void AddTranslationTablesDir_t(const CTFileName &fnmDir, const CTFile
} }
} }
// !!! FIXME: clean these out.
// translate a string // 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) ENGINE_API const char *TranslateConst(const char *str, INDEX iOffset)

2
Sources/Engine/Base/Translation.h
View File

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

4
Sources/Engine/Brushes/BrushTriangularize.cpp
View File

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

107
Sources/Engine/GameAgent/GameAgent.cpp
View File

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

2
Sources/Engine/GameAgent/MSLegacy.h
View File

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

4
Sources/Engine/Graphics/DrawPort.cpp
View File

@ -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); HRESULT hr = _pGfx->gl_pd3dDevice->Clear( 1, &d3dRect, D3DCLEAR_ZBUFFER, 0,zval,0);
D3D_CHECKERROR(hr); 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); HRESULT hr = _pGfx->gl_pd3dDevice->Clear( 0, NULL, D3DCLEAR_ZBUFFER, 0,zval,0);
D3D_CHECKERROR(hr); D3D_CHECKERROR(hr);
} }
#endif SE1_D3D #endif //SE1_D3D
} }

5
Sources/Engine/Graphics/GfxLibrary.cpp
View File

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

4
Sources/Engine/Graphics/TextureEffects.h
View File

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

2
Sources/Engine/Math/ObjectSector.cpp
View File

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

2
Sources/Engine/Sound/Wave.cpp
View File

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

2
Sources/Engine/Sound/Wave.h
View File

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

2
Sources/EntitiesMP/Player.es
View File

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

13
Sources/GameMP/Game.cpp
View File

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

6
Sources/GameMP/Game.h
View File

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

2
Sources/GameMP/LCDDrawing.cpp
View File

@ -69,7 +69,7 @@ void TiledTexture( PIXaabbox2D &_boxScreen, FLOAT fStretch, const MEX2D &vScreen
boxTexture+=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 // up
_pdp->DrawLine( _pdp->DrawLine(

2
Sources/GameMP/LCDDrawing.h
View File

@ -23,7 +23,7 @@ extern void _LCDInit(void);
extern void _LCDEnd(void); extern void _LCDEnd(void);
extern void _LCDPrepare(FLOAT fFade); extern void _LCDPrepare(FLOAT fFade);
extern void _LCDSetDrawport(CDrawPort *pdp); 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 _LCDScreenBox(COLOR col);
extern void _LCDScreenBoxOpenLeft(COLOR col); extern void _LCDScreenBoxOpenLeft(COLOR col);
extern void _LCDScreenBoxOpenRight(COLOR col); extern void _LCDScreenBoxOpenRight(COLOR col);

1
Sources/SeriousSam/FileInfo.h
View File

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

4
Sources/SeriousSam/GUI/Components/MGArrow.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/Base/KeyNames.h> #include <Engine/Base/KeyNames.h>
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include <GameMP/LCDDrawing.h> #include <GameMP/LCDDrawing.h>
#include "MGArrow.h" #include "SeriousSam/GUI/Components/MGArrow.h"
void CMGArrow::Render(CDrawPort *pdp) void CMGArrow::Render(CDrawPort *pdp)

4
Sources/SeriousSam/GUI/Components/MGArrow.h
View File

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

18
Sources/SeriousSam/GUI/Components/MGButton.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/Base/KeyNames.h> #include <Engine/Base/KeyNames.h>
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include <GameMP/LCDDrawing.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; extern CSoundData *_psdPress;
@ -74,14 +74,14 @@ void CMGButton::Render(CDrawPort *pdp)
PIXaabbox2D box = FloatBoxToPixBox(pdp, mg_boxOnScreen); PIXaabbox2D box = FloatBoxToPixBox(pdp, mg_boxOnScreen);
COLOR col = GetCurrentColor(); COLOR col = GetCurrentColor();
if (mg_bEditing) { if (mg_bEditing) {
col = LCDGetColor(C_GREEN | 0xFF, "editing"); col = _pGame->LCDGetColor(C_GREEN | 0xFF, "editing");
} }
COLOR colRectangle = col; COLOR colRectangle = col;
if (mg_bHighlighted) { if (mg_bHighlighted) {
col = LCDGetColor(C_WHITE | 0xFF, "hilited"); col = _pGame->LCDGetColor(C_WHITE | 0xFF, "hilited");
if (!mg_bFocused) { if (!mg_bFocused) {
colRectangle = LCDGetColor(C_WHITE | 0xFF, "hilited rectangle"); colRectangle = _pGame->LCDGetColor(C_WHITE | 0xFF, "hilited rectangle");
} }
} }
if (mg_bMental) { if (mg_bMental) {
@ -119,7 +119,7 @@ void CMGButton::Render(CDrawPort *pdp)
pixLeft = box.Min()(1) + box.Size()(1)*0.55f; pixLeft = box.Min()(1) + box.Size()(1)*0.55f;
pixWidth = box.Size()(1)*0.45f + 1; 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) { if (!pdp->dp_FontData->fd_bFixedWidth) {
pixY -= pdp->dp_fTextScaling * 2; 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"));
} }
} }

2
Sources/SeriousSam/GUI/Components/MGButton.h
View File

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

8
Sources/SeriousSam/GUI/Components/MGChangePlayer.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/Base/KeyNames.h> #include <Engine/Base/KeyNames.h>
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include <GameMP/LCDDrawing.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; extern CSoundData *_psdPress;
@ -48,6 +48,6 @@ void CMGChangePlayer::SetPlayerText(void)
if (iPlayer<0 || iPlayer>7) { if (iPlayer<0 || iPlayer>7) {
mg_strText = "????"; mg_strText = "????";
} else { } 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());
} }
} }

2
Sources/SeriousSam/GUI/Components/MGChangePlayer.h
View File

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

4
Sources/SeriousSam/GUI/Components/MGEdit.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/Base/KeyNames.h> #include <Engine/Base/KeyNames.h>
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include <GameMP/LCDDrawing.h> #include <GameMP/LCDDrawing.h>
#include "MGEdit.h" #include "SeriousSam/GUI/Components/MGEdit.h"
extern CSoundData *_psdPress; extern CSoundData *_psdPress;

2
Sources/SeriousSam/GUI/Components/MGEdit.h
View File

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

8
Sources/SeriousSam/GUI/Components/MGFileButton.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/Base/KeyNames.h> #include <Engine/Base/KeyNames.h>
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include <GameMP/LCDDrawing.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; extern CSoundData *_psdPress;
@ -237,7 +237,7 @@ void CMGFileButton::Render(CDrawPort *pdp)
PIX pixI = box.Min()(1); PIX pixI = box.Min()(1);
PIX pixJ = box.Min()(2); 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); pdp->PutText(mg_strInfo, pixI, pixJ, col);
} }
} }

2
Sources/SeriousSam/GUI/Components/MGFileButton.h
View File

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

10
Sources/SeriousSam/GUI/Components/MGHighScore.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/Base/KeyNames.h> #include <Engine/Base/KeyNames.h>
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include <GameMP/LCDDrawing.h> #include <GameMP/LCDDrawing.h>
#include "MGHighScore.h" #include "SeriousSam/GUI/Components/MGHighScore.h"
#define HSCOLUMNS 6 #define HSCOLUMNS 6
CTString strHighScores[HIGHSCORE_COUNT + 1][HSCOLUMNS]; CTString strHighScores[HIGHSCORE_COUNT + 1][HSCOLUMNS];
@ -30,9 +30,9 @@ void CMGHighScore::Render(CDrawPort *pdp)
{ {
SetFontMedium(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; INDEX iLastSet = _pGame->gm_iLastSetHighScore;
CTString strText; CTString strText;

2
Sources/SeriousSam/GUI/Components/MGHighScore.h
View File

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

8
Sources/SeriousSam/GUI/Components/MGKeyDefinition.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/Base/KeyNames.h> #include <Engine/Base/KeyNames.h>
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include <GameMP/LCDDrawing.h> #include <GameMP/LCDDrawing.h>
#include "MGKeyDefinition.h" #include "SeriousSam/GUI/Components/MGKeyDefinition.h"
extern CSoundData *_psdSelect; extern CSoundData *_psdSelect;
extern CSoundData *_psdPress; extern CSoundData *_psdPress;
@ -63,7 +63,7 @@ void CMGKeyDefinition::SetBindingNames(BOOL bDefining)
// find the button // find the button
INDEX ict = 0; INDEX ict = 0;
INDEX iDik = 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) { if (ict == mg_iControlNumber) {
CButtonAction &ba = *itba; CButtonAction &ba = *itba;
// get the current bindings and names // get the current bindings and names
@ -122,7 +122,7 @@ void CMGKeyDefinition::DefineKey(INDEX iDik)
{ {
// for each button in controls // for each button in controls
INDEX ict = 0; 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; CButtonAction &ba = *itba;
// if it is this one // if it is this one
if (ict == mg_iControlNumber) { if (ict == mg_iControlNumber) {

2
Sources/SeriousSam/GUI/Components/MGKeyDefinition.h
View File

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

4
Sources/SeriousSam/GUI/Components/MGLevelButton.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/Base/KeyNames.h> #include <Engine/Base/KeyNames.h>
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include <GameMP/LCDDrawing.h> #include <GameMP/LCDDrawing.h>
#include "MGLevelButton.h" #include "SeriousSam/GUI/Components/MGLevelButton.h"
extern CSoundData *_psdPress; extern CSoundData *_psdPress;

2
Sources/SeriousSam/GUI/Components/MGLevelButton.h
View File

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

14
Sources/SeriousSam/GUI/Components/MGModel.cpp
View File

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

2
Sources/SeriousSam/GUI/Components/MGModel.h
View File

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

4
Sources/SeriousSam/GUI/Components/MGServerList.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/Base/KeyNames.h> #include <Engine/Base/KeyNames.h>
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include <GameMP/LCDDrawing.h> #include <GameMP/LCDDrawing.h>
#include "MGServerList.h" #include "MGServerList.h"
#include "MGEdit.h" #include "SeriousSam/GUI/Components/MGEdit.h"
extern CSoundData *_psdSelect; extern CSoundData *_psdSelect;
extern CSoundData *_psdPress; extern CSoundData *_psdPress;

2
Sources/SeriousSam/GUI/Components/MGServerList.h
View File

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

8
Sources/SeriousSam/GUI/Components/MGSlider.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/Base/KeyNames.h> #include <Engine/Base/KeyNames.h>
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include <GameMP/LCDDrawing.h> #include <GameMP/LCDDrawing.h>
#include "MGSlider.h" #include "SeriousSam/GUI/Components/MGSlider.h"
extern PIX _pixCursorPosI; extern PIX _pixCursorPosI;
extern PIX _pixCursorPosJ; extern PIX _pixCursorPosJ;
@ -113,8 +113,8 @@ void CMGSlider::Render(CDrawPort *pdp)
pdp->PutTextR(mg_strText, pixIL, pixJ, col); pdp->PutTextR(mg_strText, pixIL, pixJ, col);
// draw box around slider // 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 // draw filled part of slider
pdp->Fill(pixIR + 2, pixJ + 1, (pixISizeR - 5)*mg_fFactor, (pixJSize - 4), col); pdp->Fill(pixIR + 2, pixJ + 1, (pixISizeR - 5)*mg_fFactor, (pixJSize - 4), col);

2
Sources/SeriousSam/GUI/Components/MGSlider.h
View File

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

6
Sources/SeriousSam/GUI/Components/MGTitle.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/Base/KeyNames.h> #include <Engine/Base/KeyNames.h>
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include <GameMP/LCDDrawing.h> #include <GameMP/LCDDrawing.h>
#include "MGTitle.h" #include "SeriousSam/GUI/Components/MGTitle.h"
void CMGTitle::Render(CDrawPort *pdp) void CMGTitle::Render(CDrawPort *pdp)
@ -28,5 +28,5 @@ void CMGTitle::Render(CDrawPort *pdp)
PIX pixI = box.Center()(1); PIX pixI = box.Center()(1);
PIX pixJ = box.Min()(2); 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"));
} }

2
Sources/SeriousSam/GUI/Components/MGTitle.h
View File

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

4
Sources/SeriousSam/GUI/Components/MGTrigger.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/Base/KeyNames.h> #include <Engine/Base/KeyNames.h>
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include <GameMP/LCDDrawing.h> #include <GameMP/LCDDrawing.h>
#include "MGTrigger.h" #include "SeriousSam/GUI/Components/MGTrigger.h"
INDEX GetNewLoopValue(int iVKey, INDEX iCurrent, INDEX ctMembers) INDEX GetNewLoopValue(int iVKey, INDEX iCurrent, INDEX ctMembers)

2
Sources/SeriousSam/GUI/Components/MGTrigger.h
View File

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

12
Sources/SeriousSam/GUI/Components/MGVarButton.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/Base/KeyNames.h> #include <Engine/Base/KeyNames.h>
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include <GameMP/LCDDrawing.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 _pixCursorPosI;
extern PIX _pixCursorPosJ; extern PIX _pixCursorPosJ;
@ -139,7 +139,7 @@ void CMGVarButton::Render(CDrawPort *pdp)
if (mg_pvsVar->vs_bSeparator) if (mg_pvsVar->vs_bSeparator)
{ {
mg_bEnabled = FALSE; mg_bEnabled = FALSE;
COLOR col = LCDGetColor(C_WHITE | 255, "separator"); COLOR col = _pGame->LCDGetColor(C_WHITE | 255, "separator");
CTString strText = mg_pvsVar->vs_strName; CTString strText = mg_pvsVar->vs_strName;
pdp->PutTextC(strText, pixIC, pixJ, col); pdp->PutTextC(strText, pixIC, pixJ, col);
} else if (mg_pvsVar->Validate()) { } else if (mg_pvsVar->Validate()) {
@ -157,8 +157,8 @@ void CMGVarButton::Render(CDrawPort *pdp)
// draw box around slider // draw box around slider
PIX pixISize = box.Size()(1)*0.13f; PIX pixISize = box.Size()(1)*0.13f;
PIX pixJSize = box.Size()(2); 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 // draw filled part of slider
if (mg_pvsVar->vs_iSlider == 1) { if (mg_pvsVar->vs_iSlider == 1) {

2
Sources/SeriousSam/GUI/Components/MGVarButton.h
View File

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

24
Sources/SeriousSam/GUI/Components/MenuGadget.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/Base/KeyNames.h> #include <Engine/Base/KeyNames.h>
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include <GameMP/LCDDrawing.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 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) CMenuGadget::CMenuGadget(void)
@ -107,17 +107,17 @@ void CMenuGadget::OnMouseOver(PIX pixI, PIX pixJ)
COLOR CMenuGadget::GetCurrentColor(void) COLOR CMenuGadget::GetCurrentColor(void)
{ {
// use normal colors // 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 disabled
if (!mg_bEnabled) { if (!mg_bEnabled) {
// use a bit darker colors // 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 label
if (mg_bLabel) { if (mg_bLabel) {
// use white // use white
colUnselected = colSelected = LCDGetColor(C_WHITE, "label"); colUnselected = colSelected = _pGame->LCDGetColor(C_WHITE, "label");
} }
} }
// use unselected color // use unselected color

2
Sources/SeriousSam/GUI/Components/MenuGadget.h
View File

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

6
Sources/SeriousSam/GUI/Menus/GameMenu.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.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) CGameMenu::CGameMenu(void)

4
Sources/SeriousSam/GUI/Menus/MAudioOptions.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "MenuStuff.h" #include "MenuStuff.h"
#include "MAudioOptions.h" #include "MAudioOptions.h"

10
Sources/SeriousSam/GUI/Menus/MAudioOptions.h
View File

@ -19,11 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CAudioOptionsMenu : public CGameMenu {

4
Sources/SeriousSam/GUI/Menus/MConfirm.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "MConfirm.h" #include "MConfirm.h"
void CConfirmMenu::Initialize_t(void) void CConfirmMenu::Initialize_t(void)

4
Sources/SeriousSam/GUI/Menus/MConfirm.h
View File

@ -19,8 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CConfirmMenu : public CGameMenu {

10
Sources/SeriousSam/GUI/Menus/MControls.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "MenuStuff.h" #include "MenuStuff.h"
#include "MControls.h" #include "MControls.h"
@ -99,7 +99,7 @@ void CControlsMenu::StartMenu(void)
ControlsMenuOn(); 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(); ObtainActionSettings();
CGameMenu::StartMenu(); CGameMenu::StartMenu();
@ -116,7 +116,7 @@ void CControlsMenu::EndMenu(void)
void CControlsMenu::ObtainActionSettings(void) void CControlsMenu::ObtainActionSettings(void)
{ {
CControls &ctrls = _pGame->gm_ctrlControlsExtra; CControls &ctrls = *_pGame->gm_ctrlControlsExtra;
gm_mgSensitivity.mg_iMinPos = 0; gm_mgSensitivity.mg_iMinPos = 0;
gm_mgSensitivity.mg_iMaxPos = 50; gm_mgSensitivity.mg_iMaxPos = 50;
@ -137,7 +137,7 @@ void CControlsMenu::ObtainActionSettings(void)
void CControlsMenu::ApplyActionSettings(void) void CControlsMenu::ApplyActionSettings(void)
{ {
CControls &ctrls = _pGame->gm_ctrlControlsExtra; CControls &ctrls = *_pGame->gm_ctrlControlsExtra;
FLOAT fSensitivity = FLOAT fSensitivity =
FLOAT(gm_mgSensitivity.mg_iCurPos - gm_mgSensitivity.mg_iMinPos) / FLOAT(gm_mgSensitivity.mg_iCurPos - gm_mgSensitivity.mg_iMinPos) /

10
Sources/SeriousSam/GUI/Menus/MControls.h
View File

@ -19,11 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CControlsMenu : public CGameMenu {

2
Sources/SeriousSam/GUI/Menus/MCredits.h
View File

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

8
Sources/SeriousSam/GUI/Menus/MCustomizeAxis.cpp
View File

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

8
Sources/SeriousSam/GUI/Menus/MCustomizeAxis.h
View File

@ -19,10 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CCustomizeAxisMenu : public CGameMenu {

10
Sources/SeriousSam/GUI/Menus/MCustomizeKeyboard.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "MenuStuff.h" #include "MenuStuff.h"
#include "MCustomizeKeyboard.h" #include "MCustomizeKeyboard.h"
@ -32,8 +32,8 @@ void CCustomizeKeyboardMenu::FillListItems(void)
BOOL bHasLast = FALSE; BOOL bHasLast = FALSE;
// set diks to key buttons // set diks to key buttons
INDEX iLabel = 0; 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; INDEX iInMenu = iLabel - gm_iListOffset;
if ((iLabel >= gm_iListOffset) && if ((iLabel >= gm_iListOffset) &&
@ -100,7 +100,7 @@ void CCustomizeKeyboardMenu::StartMenu(void)
{ {
ControlsMenuOn(); ControlsMenuOn();
gm_iListOffset = 0; gm_iListOffset = 0;
gm_ctListTotal = _pGame->gm_ctrlControlsExtra.ctrl_lhButtonActions.Count(); gm_ctListTotal = _pGame->gm_ctrlControlsExtra->ctrl_lhButtonActions.Count();
gm_iListWantedItem = 0; gm_iListWantedItem = 0;
CGameMenu::StartMenu(); CGameMenu::StartMenu();
} }

8
Sources/SeriousSam/GUI/Menus/MCustomizeKeyboard.h
View File

@ -19,10 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CCustomizeKeyboardMenu : public CGameMenu {

4
Sources/SeriousSam/GUI/Menus/MDisabled.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "MDisabled.h" #include "MDisabled.h"

6
Sources/SeriousSam/GUI/Menus/MDisabled.h
View File

@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CDisabledMenu : public CGameMenu {

4
Sources/SeriousSam/GUI/Menus/MHighScore.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "MHighScore.h" #include "MHighScore.h"

6
Sources/SeriousSam/GUI/Menus/MHighScore.h
View File

@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CHighScoreMenu : public CGameMenu {

6
Sources/SeriousSam/GUI/Menus/MInGame.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "MInGame.h" #include "MInGame.h"
@ -136,7 +136,7 @@ void CInGameMenu::StartMenu(void)
if (_gmRunningGameMode == GM_SINGLE_PLAYER) { if (_gmRunningGameMode == GM_SINGLE_PLAYER) {
CPlayerCharacter &pc = _pGame->gm_apcPlayers[_pGame->gm_iSinglePlayer]; 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 = ""; gm_mgLabel2.mg_strText = "";
} else { } else {

6
Sources/SeriousSam/GUI/Menus/MInGame.h
View File

@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CInGameMenu : public CGameMenu {

6
Sources/SeriousSam/GUI/Menus/MLevels.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "LevelInfo.h" #include "SeriousSam/LevelInfo.h"
#include "MLevels.h" #include "MLevels.h"

8
Sources/SeriousSam/GUI/Menus/MLevels.h
View File

@ -19,10 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CLevelsMenu : public CGameMenu {

8
Sources/SeriousSam/GUI/Menus/MLoadSave.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "MenuStuff.h" #include "MenuStuff.h"
#include "MLoadSave.h" #include "MLoadSave.h"
@ -74,7 +74,7 @@ void CLoadSaveMenu::StartMenu(void)
// list the directory // list the directory
CDynamicStackArray<CTFileName> afnmDir; CDynamicStackArray<CTFileName> afnmDir;
MakeDirList(afnmDir, gm_fnmDirectory, "", 0); MakeDirList(afnmDir, gm_fnmDirectory, CTString(""), 0);
gm_iLastFile = -1; gm_iLastFile = -1;
// for each file in the directory // for each file in the directory
@ -222,7 +222,7 @@ BOOL CLoadSaveMenu::ParseFile(const CTFileName &fnm, CTString &strName)
INDEX iCtl = -1; INDEX iCtl = -1;
strName.ScanF("Controls%d", &iCtl); strName.ScanF("Controls%d", &iCtl);
if (iCtl >= 0 && iCtl <= 7) { 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());
} }
} }
} }

10
Sources/SeriousSam/GUI/Menus/MLoadSave.h
View File

@ -19,11 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 #define SAVELOAD_BUTTONS_CT 14

4
Sources/SeriousSam/GUI/Menus/MMain.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "MenuStuff.h" #include "MenuStuff.h"
#include "MMain.h" #include "MMain.h"

4
Sources/SeriousSam/GUI/Menus/MMain.h
View File

@ -19,8 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CMainMenu : public CGameMenu {

4
Sources/SeriousSam/GUI/Menus/MNetwork.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "MNetwork.h" #include "MNetwork.h"

6
Sources/SeriousSam/GUI/Menus/MNetwork.h
View File

@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CNetworkMenu : public CGameMenu {

4
Sources/SeriousSam/GUI/Menus/MNetworkJoin.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "MenuStuff.h" #include "MenuStuff.h"
#include "MNetworkJoin.h" #include "MNetworkJoin.h"

6
Sources/SeriousSam/GUI/Menus/MNetworkJoin.h
View File

@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CNetworkJoinMenu : public CGameMenu {

4
Sources/SeriousSam/GUI/Menus/MNetworkOpen.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "MenuStuff.h" #include "MenuStuff.h"
#include "MNetworkOpen.h" #include "MNetworkOpen.h"

8
Sources/SeriousSam/GUI/Menus/MNetworkOpen.h
View File

@ -19,10 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CNetworkOpenMenu : public CGameMenu {

6
Sources/SeriousSam/GUI/Menus/MNetworkStart.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.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 "MenuStuff.h"
#include "MNetworkStart.h" #include "MNetworkStart.h"

10
Sources/SeriousSam/GUI/Menus/MNetworkStart.h
View File

@ -19,11 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CNetworkStartMenu : public CGameMenu {

4
Sources/SeriousSam/GUI/Menus/MOptions.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "MOptions.h" #include "MOptions.h"

6
Sources/SeriousSam/GUI/Menus/MOptions.h
View File

@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class COptionsMenu : public CGameMenu {

10
Sources/SeriousSam/GUI/Menus/MPlayerProfile.cpp
View File

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

12
Sources/SeriousSam/GUI/Menus/MPlayerProfile.h
View File

@ -19,12 +19,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#endif #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 { class CPlayerProfileMenu : public CGameMenu {

2
Sources/SeriousSam/GUI/Menus/MRenderingOptions.h
View File

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

4
Sources/SeriousSam/GUI/Menus/MSelectPlayers.cpp
View File

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "StdH.h" #include "SeriousSam/StdH.h"
#include <Engine/CurrentVersion.h> #include <Engine/CurrentVersion.h>
#include "MenuPrinting.h" #include "SeriousSam/GUI/Menus/MenuPrinting.h"
#include "MenuStuff.h" #include "MenuStuff.h"
#include "MSelectPlayers.h" #include "MSelectPlayers.h"

Some files were not shown because too many files have changed in this diff Show More