From e9267112a1ff13c338d2215e158f1bd404b179da Mon Sep 17 00:00:00 2001 From: zcaliptium Date: Thu, 31 Mar 2016 20:12:26 +0300 Subject: [PATCH] GameExecutable: Get rid of the TECHTESTONLY and _SE_DEMO code. --- Sources/SeriousSam/CmdLine.cpp | 6 ----- Sources/SeriousSam/Credits.cpp | 4 --- Sources/SeriousSam/GUI/Menus/Menu.cpp | 5 ---- Sources/SeriousSam/GUI/Menus/MenuActions.cpp | 27 +++----------------- Sources/SeriousSam/SeriousSam.cpp | 11 ++------ Sources/SeriousSam/StdH.h | 2 -- 6 files changed, 6 insertions(+), 49 deletions(-) diff --git a/Sources/SeriousSam/CmdLine.cpp b/Sources/SeriousSam/CmdLine.cpp index 4156bfe..dfcd7b7 100644 --- a/Sources/SeriousSam/CmdLine.cpp +++ b/Sources/SeriousSam/CmdLine.cpp @@ -112,12 +112,6 @@ void ParseCommandLine(CTString strCmd) cmd_bQuickJoin = TRUE; } else if (strWord=="+game") { CTString strMod = GetNextParam(); -#if _SE_DEMO - if (strMod!="SeriousSam" && strMod!="Warped") { - FatalError(TRANS("This MOD is not allowed in demo version!")); - return; - } -#endif if (strMod!="SeriousSam") { // (we ignore default mod - always use base dir in that case) _fnmMod = "Mods\\"+strMod+"\\"; } diff --git a/Sources/SeriousSam/Credits.cpp b/Sources/SeriousSam/Credits.cpp index 489e9d6..d44db17 100644 --- a/Sources/SeriousSam/Credits.cpp +++ b/Sources/SeriousSam/Credits.cpp @@ -99,11 +99,7 @@ void Credits_On(INDEX iType) LoadOneFile(CTFILENAME("Data\\Credits_End.txt")); } else { _fSpeed = 2.0f; -#if _SE_DEMO || TECHTESTONLY - LoadOneFile(CTFILENAME("Data\\Credits_Demo.txt")); -#else LoadOneFile(CTFILENAME("Data\\Credits.txt")); -#endif } // if some file was loaded if (_bCreditsOn) { diff --git a/Sources/SeriousSam/GUI/Menus/Menu.cpp b/Sources/SeriousSam/GUI/Menus/Menu.cpp index c383533..387fca4 100644 --- a/Sources/SeriousSam/GUI/Menus/Menu.cpp +++ b/Sources/SeriousSam/GUI/Menus/Menu.cpp @@ -259,13 +259,8 @@ void InitializeMenus(void) // initialize and load menu textures _toPointer.SetData_t( CTFILENAME( "Textures\\General\\Pointer.tex")); -#if _SE_DEMO || TECHTESTONLY - _toLogoMenuA.SetData_t( CTFILENAME( "Textures\\Logo\\sam_menulogo256a_demo.tex")); - _toLogoMenuB.SetData_t( CTFILENAME( "Textures\\Logo\\sam_menulogo256b_demo.tex")); -#else _toLogoMenuA.SetData_t( CTFILENAME( "Textures\\Logo\\sam_menulogo256a.tex")); _toLogoMenuB.SetData_t( CTFILENAME( "Textures\\Logo\\sam_menulogo256b.tex")); -#endif } catch( char *strError) { FatalError( strError); diff --git a/Sources/SeriousSam/GUI/Menus/MenuActions.cpp b/Sources/SeriousSam/GUI/Menus/MenuActions.cpp index 3a88f15..97e29c8 100644 --- a/Sources/SeriousSam/GUI/Menus/MenuActions.cpp +++ b/Sources/SeriousSam/GUI/Menus/MenuActions.cpp @@ -37,7 +37,6 @@ INDEX _ctResolutions = 0; CTString * _astrResolutionTexts = NULL; CDisplayMode *_admResolutionModes = NULL; -extern BOOL _bMouseRight = FALSE; extern BOOL _bMouseUsedLast; ENGINE_API extern INDEX snd_iFormat; @@ -281,11 +280,7 @@ void InitActionsForMainMenu() { CMENU.gm_mgNetwork.mg_pActivatedFunction = StartNetworkMenu; CMENU.gm_mgSplitScreen.mg_pActivatedFunction = &StartSplitScreenMenu; CMENU.gm_mgDemo.mg_pActivatedFunction = &StartDemoLoadMenu; -#if TECHTESTONLY - CMENU.gm_mgMods.mg_pActivatedFunction = &DisabledFunction; -#else CMENU.gm_mgMods.mg_pActivatedFunction = &StartModsLoadMenu; -#endif CMENU.gm_mgHighScore.mg_pActivatedFunction = &StartHighScoreMenu; CMENU.gm_mgOptions.mg_pActivatedFunction = &StartOptionsMenu; CMENU.gm_mgQuit.mg_pActivatedFunction = &ExitConfirm; @@ -318,11 +313,7 @@ void InitActionsForInGameMenu() { CMENU.gm_mgSave.mg_pActivatedFunction = &StartCurrentSaveMenu; CMENU.gm_mgHighScore.mg_pActivatedFunction = &StartHighScoreMenu; CMENU.gm_mgOptions.mg_pActivatedFunction = &StartOptionsMenu; -#if TECHTESTONLY - CMENU.gm_mgStop.mg_pActivatedFunction = &ExitConfirm; -#else CMENU.gm_mgStop.mg_pActivatedFunction = &StopConfirm; -#endif CMENU.gm_mgQuit.mg_pActivatedFunction = &ExitConfirm; } @@ -364,11 +355,7 @@ void StartTraining(void) void InitActionsForSinglePlayerMenu() { CMENU.gm_mgNewGame.mg_pActivatedFunction = &StartSinglePlayerNewMenu; -#if _SE_DEMO || TECHTESTONLY - CMENU.gm_mgCustom.mg_pActivatedFunction = &DisabledFunction; -#else CMENU.gm_mgCustom.mg_pActivatedFunction = &StartSelectLevelFromSingle; -#endif CMENU.gm_mgQuickLoad.mg_pActivatedFunction = &StartSinglePlayerQuickLoadMenu; CMENU.gm_mgLoad.mg_pActivatedFunction = &StartSinglePlayerLoadMenu; CMENU.gm_mgTraining.mg_pActivatedFunction = &StartTraining; @@ -727,12 +714,14 @@ extern void UpdateVideoOptionsButtons(INDEX iSelected) CMENU.gm_mgDisplayAdaptersTrigger.mg_bEnabled = _ctAdapters>1; CMENU.gm_mgApply.mg_bEnabled = _bVideoOptionsChanged; // determine which should be visible + CMENU.gm_mgFullScreenTrigger.mg_bEnabled = TRUE; if (da.da_ulFlags&DAF_FULLSCREENONLY) { CMENU.gm_mgFullScreenTrigger.mg_bEnabled = FALSE; CMENU.gm_mgFullScreenTrigger.mg_iSelected = 1; CMENU.gm_mgFullScreenTrigger.ApplyCurrentSelection(); } + CMENU.gm_mgBitsPerPixelTrigger.mg_bEnabled = TRUE; if (CMENU.gm_mgFullScreenTrigger.mg_iSelected == 0) { CMENU.gm_mgBitsPerPixelTrigger.mg_bEnabled = FALSE; @@ -917,11 +906,7 @@ static void OnWaveVolumeChange(INDEX iCurPos) void WaveSliderChange(void) { - if (_bMouseRight) { - CMENU.gm_mgWaveVolume.mg_iCurPos += 5; - } else { - CMENU.gm_mgWaveVolume.mg_iCurPos -= 5; - } + CMENU.gm_mgWaveVolume.mg_iCurPos -= 5; CMENU.gm_mgWaveVolume.ApplyCurrentPosition(); } @@ -934,11 +919,7 @@ void FrequencyTriggerChange(INDEX iDummy) void MPEGSliderChange(void) { - if (_bMouseRight) { - CMENU.gm_mgMPEGVolume.mg_iCurPos += 5; - } else { - CMENU.gm_mgMPEGVolume.mg_iCurPos -= 5; - } + CMENU.gm_mgMPEGVolume.mg_iCurPos -= 5; CMENU.gm_mgMPEGVolume.ApplyCurrentPosition(); } diff --git a/Sources/SeriousSam/SeriousSam.cpp b/Sources/SeriousSam/SeriousSam.cpp index 5276d46..b18fc39 100644 --- a/Sources/SeriousSam/SeriousSam.cpp +++ b/Sources/SeriousSam/SeriousSam.cpp @@ -111,11 +111,8 @@ extern CTextureObject *_ptoLogoEAX = NULL; extern CTString sam_strVersion = "1.10"; extern CTString sam_strModName = TRANS("- O P E N S O U R C E -"); -#if _SE_DEMO - extern CTString sam_strFirstLevel = "Levels\\KarnakDemo.wld"; -#else - extern CTString sam_strFirstLevel = "Levels\\LevelsMP\\1_0_InTheLastEpisode.wld"; -#endif + +extern CTString sam_strFirstLevel = "Levels\\LevelsMP\\1_0_InTheLastEpisode.wld"; extern CTString sam_strIntroLevel = "Levels\\LevelsMP\\Intro.wld"; extern CTString sam_strGameName = "serioussamse"; @@ -548,10 +545,6 @@ BOOL Init( HINSTANCE hInstance, int nCmdShow, CTString strCmdLine) _pShell->SetString("net_strConnectPassword", cmd_strPassword); } -#if TECHTESTONLY - cmd_strWorld = CTString("Levels\\TechTestElsa.wld"); -#endif - // if connecting to server from command line if (cmd_strServer!="") { CTString strPort = ""; diff --git a/Sources/SeriousSam/StdH.h b/Sources/SeriousSam/StdH.h index 0e407da..a6dc39b 100644 --- a/Sources/SeriousSam/StdH.h +++ b/Sources/SeriousSam/StdH.h @@ -32,7 +32,5 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #undef DECL_DLL -#define TECHTESTONLY 0 - #include "SeriousSam.h" #include "GUI/Menus/Menu.h" \ No newline at end of file