add options menu

fix #98 (we now replicate amiga and dos behavior depending on version for the in game map visible tiles)

Author: segrax

CMakeLists.txt

@@ -15,6 +15,13 @@ set(CMAKE_CXX_STANDARD 14)
 option(OPENFODDER_ENABLE_FFMPEG "Enable FFmpeg intro video playback" OFF)
 option(OPENFODDER_AUTO_FFMPEG "Auto-enable FFmpeg when found (non-Windows)" ON)
 
+if(MSVC)
+    # Enable Hot Reload (Edit and Continue) for Debug builds.
+    set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<IF:$<CONFIG:Debug>,EditAndContinue,ProgramDatabase>")
+    add_compile_options($<$<CONFIG:Debug>:/ZI>)
+    add_link_options($<$<CONFIG:Debug>:/INCREMENTAL>)
+endif()
+
 if(EMSCRIPTEN)
     set(OPENFODDER_EMSCRIPTEN ON)
 else()

Source/Briefing.cpp

@@ -505,10 +505,10 @@ void cFodder::Briefing_Intro_Helicopter_Play(const bool pShowHelicopter, eTileTy
         return;
 
     mSurface->clearBuffer();
-	mWindow->SetScreenSize(mVersionCurrent->GetScreenSize());
+    mWindow->SetScreenSize(mVersionCurrent->GetScreenSize());
 
     if (pTileset >= eTileTypes_Hid)
-		pTileset = eTileTypes_Jungle;
+        pTileset = eTileTypes_Jungle;
 
     mGraphics->Mission_Intro_Load_Resources(pTileset);
     mGraphics->SetActiveSpriteSheet(eGFX_BRIEFING);
@@ -520,7 +520,7 @@ void cFodder::Briefing_Intro_Helicopter_Play(const bool pShowHelicopter, eTileTy
     //Briefing_Intro_Helicopter_Draw_Mission_Name();
     mSurface->Save();
 
-	// Prior to mission 4, the UFO is not shown on the mission intro
+    // Prior to mission 4, the UFO is not shown on the mission intro
     bool ShowHelicopter = true;
     if (mVersionCurrent->isCannonFodder2() && mGame_Data.mMission_Number < 4 && !pShowHelicopter)
         ShowHelicopter = false;

Source/Camera.cpp

@@ -288,7 +288,8 @@ void cFodder::Camera_Speed_Calculate()
 
     // loc_11B9C
     //  Calculate maximum right position of camera
-    Data0 = mMapLoaded->getWidthPixels() - getCameraWidth();
+    const int32 originXPixels = (int32)getMapVisibleOriginX() << 4;
+    Data0 = originXPixels + getMapVisibleWidthPixels() - getCameraWidth();
     Data0 = (Data0 << 16) | (Data0 >> 16);
 
     int32 Data4 = mCameraX + mCamera_Speed_X;
@@ -298,7 +299,8 @@ void cFodder::Camera_Speed_Calculate()
         mCamera_Speed_X = Data0;
     }
     // loc_11BE8
-    Data0 = mMapLoaded->getHeightPixels() - getCameraHeight();
+    const int32 originYPixels = (int32)getMapVisibleOriginY() << 4;
+    Data0 = originYPixels + getMapVisibleHeightPixels() - getCameraHeight();
     Data0 = (Data0 << 16) | (Data0 >> 16);
 
     Data4 = mCameraY + mCamera_Speed_Y;
@@ -353,23 +355,30 @@ void cFodder::Camera_SetTargetToStartPosition()
     int16 Data0 = mCameraX >> 16;
     int16 Data4 = mCameraY >> 16;
 
+    const int16 originXPixels = (int16)getMapVisibleOriginX() << 4;
+    const int16 originYPixels = (int16)getMapVisibleOriginY() << 4;
+
     int16 Data8 = mCamera_StartPosition_X;
     Data8 -= (getCameraWidth() / 2) - 8;
-    if (Data8 < 0)
-        Data8 = 0;
+    if (Data8 < originXPixels)
+        Data8 = originXPixels;
 
-    int16 Data10 = mMapLoaded->getWidthPixels();
+    int16 Data10 = originXPixels + (int16)getMapVisibleWidthPixels();
     Data10 -= (getCameraWidth() / 2) - 8;
+    if (Data10 < originXPixels)
+        Data10 = originXPixels;
     if (Data8 >= Data10)
         Data8 = Data10;
 
     int16 DataC = mCamera_StartPosition_Y;
     DataC -= (getCameraHeight() - 8) / 2;
-    if (DataC < 0)
-        DataC = 0;
+    if (DataC < originYPixels)
+        DataC = originYPixels;
 
-    Data10 = mMapLoaded->getHeightPixels();
+    Data10 = originYPixels + (int16)getMapVisibleHeightPixels();
     Data10 -= (getCameraHeight() - 8) / 2;
+    if (Data10 < originYPixels)
+        Data10 = originYPixels;
     if (DataC >= Data10)
         DataC = Data10;
 
@@ -465,21 +474,31 @@ void cFodder::Camera_Pan_ComputeSpeed()
 
     Data4 >>= 4;
 
-    int16 Data8 = mMapLoaded->getWidth();
-    Data8 -= (getCameraWidth() >> 4) + 1;
+    int16 MinTileX = getMapVisibleOriginX();
+    int16 MinTileY = getMapVisibleOriginY();
+
+    int16 Data8 = getMapVisibleOriginX() + getMapVisibleWidth();
+    const int16 cameraTiles = (getCameraWidth() >> 4);
+    const int16 rightPadding = isAmigaMapBounds() ? 0 : 1;
+    Data8 -= cameraTiles + rightPadding;
 
-    if (Data8 < 0)
-        Data8 = 0;
+    if (Data8 < MinTileX)
+        Data8 = MinTileX;
 
-    if (Data0 >= Data8)
+    if (Data0 < MinTileX)
+        Data0 = MinTileX;
+    if (Data0 > Data8)
         Data0 = Data8;
 
-    Data8 = mMapLoaded->getHeight();
-    Data8 -= (getCameraHeight() + 32) >> 4;
-    if (Data8 < 0)
-        Data8 = 0;
+    Data8 = getMapVisibleOriginY() + getMapVisibleHeight();
+    const int16 yPadPixels = isAmigaMapBounds() ? 16 : 32;
+    Data8 -= (getCameraHeight() + yPadPixels) >> 4;
+    if (Data8 < MinTileY)
+        Data8 = MinTileY;
 
-    if (Data4 >= Data8)
+    if (Data4 < MinTileY)
+        Data4 = MinTileY;
+    if (Data4 > Data8)
         Data4 = Data8;
 
     Data8 = mCameraX >> 16;
@@ -554,15 +573,13 @@ void cFodder::Camera_TileSpeedX_Set()
     mCamera_TileSpeed_Overflow = 0;
 
     int32 dword_39F5A = mCameraX;
+    const int32 minCameraX = ((int32)getMapVisibleOriginX() << 4) << 16;
 
     mCameraX += mCamera_Speed_X;
-    if (mCameraX < 0)
+    if (mCameraX < minCameraX)
     {
-        mCamera_Speed_X = dword_39F5A;
-        if (mCamera_Speed_X)
-            mCamera_Speed_X = -mCamera_Speed_X;
-
-        mCameraX = 0;
+        mCamera_Speed_X = 0;
+        mCameraX = minCameraX;
     }
     // loc_12147
     mCamera_TileSpeedX += mCamera_Speed_X;
@@ -596,16 +613,13 @@ void cFodder::Camera_TileSpeedY_Set()
 {
 
     int32 dword_39F5A = mCameraY;
+    const int32 minCameraY = ((int32)getMapVisibleOriginY() << 4) << 16;
 
     mCameraY += mCamera_Speed_Y;
-    if (mCameraY < 0)
+    if (mCameraY < minCameraY)
     {
-        mCamera_Speed_Y = dword_39F5A;
-
-        if (mCamera_Speed_Y)
-            mCamera_Speed_Y = -mCamera_Speed_Y;
-
-        mCameraY = 0;
+        mCamera_Speed_Y = 0;
+        mCameraY = minCameraY;
     }
 
     // loc_121F2

Source/CampaignSelect.cpp

@@ -103,6 +103,9 @@ void cFodder::Campaign_Select_DrawMenu(const char* pTitle, const char* pSubTitle
     GUI_Button_Draw_SmallAt("ABOUT", 0xA, 0xB3 + YOffset);
     GUI_Button_Setup(&cFodder::GUI_Button_Show_About);
 
+    GUI_Button_Draw_SmallAt("OPTIONS", 0xA, 0x9C + YOffset);
+    GUI_Button_Setup(&cFodder::GUI_Button_Show_Options);
+
 
     int16 ItemCount = 0;
 
@@ -432,6 +435,15 @@ void cFodder::Campaign_Select_File_Cycle(const char* pTitle, const char* pSubTit
 	if (mMouse_Button_Left_Toggle)
 		GUI_Handle_Element_Mouse_Check(mGUI_Elements);
 
+    if (mGUI_SaveLoadAction == 5) {
+        Options_Menu_Run();
+        mGUI_SaveLoadAction = 0;
+        mMouse_Button_Left_Toggle = 0;
+        mGraphics->PaletteSet();
+        mSurface->palette_FadeTowardNew();
+        mSurface->Save();
+    }
+
 	GUI_Button_Load_MouseWheel();
 }
 

Source/Fodder.cpp

@@ -2132,13 +2132,19 @@ void cFodder::keyProcess(uint8 pKeyCode, bool pPressed)
     }
 
     if ((pKeyCode == SDL_SCANCODE_EQUALS && pPressed) || (pKeyCode == SDL_SCANCODE_KP_PLUS && pPressed))
+    {
         mWindow->WindowIncrease();
+    }
 
     if ((pKeyCode == SDL_SCANCODE_MINUS && pPressed) || (pKeyCode == SDL_SCANCODE_KP_MINUS && pPressed))
+    {
         mWindow->WindowDecrease();
+    }
 
     if (pKeyCode == SDL_SCANCODE_F11 && pPressed)
+    {
         mWindow->ToggleFullscreen();
+    }
 
     if (pKeyCode == SDL_SCANCODE_F12 && pPressed)
     {
@@ -2392,7 +2398,6 @@ cDimension cFodder::getSurfaceSize() const
 
 cDimension cFodder::getWindowSize() const
 {
-
     if (!mParams->mWindowColumns || !mParams->mWindowRows)
     {
         if (mVersionCurrent)
@@ -2425,6 +2430,65 @@ int16 cFodder::getWindowColumns() const
     return (int16)mParams->mWindowColumns;
 }
 
+bool cFodder::isAmigaMapBounds() const
+{
+    return mVersionCurrent && mVersionCurrent->isAmiga();
+}
+
+int16 cFodder::getMapVisibleOriginX() const
+{
+    if (isAmigaMapBounds())
+        return 1;
+    return 0;
+}
+
+int16 cFodder::getMapVisibleOriginY() const
+{
+    return 0;
+}
+
+int16 cFodder::getMapVisibleWidth() const
+{
+    if (!mMapLoaded)
+        return 0;
+
+    int16 width = static_cast<int16>(mMapLoaded->getWidth());
+    if (isAmigaMapBounds())
+    {
+        width -= 2;
+        if (width < 0)
+            width = 0;
+    }
+    return width;
+}
+
+int16 cFodder::getMapVisibleHeight() const
+{
+    if (!mMapLoaded)
+        return 0;
+
+    int16 height = static_cast<int16>(mMapLoaded->getHeight());
+    if (isAmigaMapBounds())
+    {
+        const int16 cameraTiles = (getCameraHeight() >> 4);
+        if (height == cameraTiles + 1)
+            height -= 1;
+        if (height < 0)
+            height = 0;
+    }
+    return height;
+}
+
+int32 cFodder::getMapVisibleWidthPixels() const
+{
+    return (int32)getMapVisibleWidth() << 4;
+}
+
+int32 cFodder::getMapVisibleHeightPixels() const
+{
+    return (int32)getMapVisibleHeight() << 4;
+}
+
 void cFodder::DataNotFound()
 {
     g_Debugger->Error("No game data could be found, including the demos, have you installed the data pack?");

Source/Fodder.hpp

@@ -93,6 +93,7 @@ class cFodder {
     bool                    mSoundDisabled;
 
     bool                    mVersionPlatformSwitchDisabled;
+
     const sGameVersion*     mVersionDefault;		// Version to switch back to when looking for data
     const sGameVersion*     mVersionCurrent;		// Version currently being used
     bool                    mVersionReturnAfterPhase;   // Return to default data after phase
@@ -1171,6 +1172,7 @@ class cFodder {
     void            GUI_Button_Load_Down();
     void            GUI_Button_Load_Exit();
     void            GUI_Button_Show_About();
+    void            GUI_Button_Show_Options();
     void            GUI_Button_Filename();
 
     int16           GUI_Button_NoAction();
@@ -1386,6 +1388,13 @@ class cFodder {
 
 	int16			getWindowRows() const;
 	int16			getWindowColumns() const;
+	bool			isAmigaMapBounds() const;
+	int16			getMapVisibleOriginX() const;
+	int16			getMapVisibleOriginY() const;
+	int16			getMapVisibleWidth() const;
+	int16			getMapVisibleHeight() const;
+	int32			getMapVisibleWidthPixels() const;
+	int32			getMapVisibleHeightPixels() const;
 
 	int16			getCameraWidth() const;
 	int16			getCameraHeight() const;

Source/GUI_Element.cpp

@@ -1407,6 +1407,12 @@ void cFodder::GUI_Button_Show_About()
     mGUI_SaveLoadAction = 4;
 }
 
+void cFodder::GUI_Button_Show_Options()
+{
+    mGUI_Select_File_String_Input_Callback = 0;
+    mGUI_SaveLoadAction = 5;
+}
+
 void cFodder::GUI_Input_CheckKey()
 {
 

Source/Intro.cpp

@@ -267,7 +267,7 @@ void cFodder::Intro_PlayVideo() {
 		return;
 	}
 
-	if (mStartParams && mStartParams->mDisableVideo)
+	if (mStartParams && (mStartParams->mDisableVideo || mStartParams->mDisableIntroVideo))
 		return;
 #ifdef OPENFODDER_ENABLE_FFMPEG
 	cVideoMPEG introVideo;