improve the spacing in the options menu

improve discord notification handling

Author: segrax

.github/workflows/linux-build.yml

@@ -61,8 +61,9 @@ jobs:
           $runUrl = "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
           $artifactUrl = "${{ steps.upload_artifact.outputs.artifact-url }}"
           if (-not $artifactUrl) { $artifactUrl = "N/A" }
-          $commitMessage = "${{ github.event.head_commit.message }}"
-          if (-not $commitMessage) { $commitMessage = "${{ github.event.pull_request.title }}" }
+          $event = Get-Content $env:GITHUB_EVENT_PATH -Raw | ConvertFrom-Json
+          $commitMessage = $event.head_commit.message
+          if (-not $commitMessage) { $commitMessage = $event.pull_request.title }
           if (-not $commitMessage) { $commitMessage = "N/A" }
           $payload = @{
             username = "GitHub Actions"

.github/workflows/windows-build.yml

@@ -149,8 +149,9 @@ jobs:
           $title = "OpenFodder Windows build $status (${{ matrix.arch }})"
           $runUrl = "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
           $artifactUrl = "https://s3.amazonaws.com/openfodder-builds/OpenFodder-${{ matrix.arch }}-${{ matrix.configuration }}-latest.zip"
-          $commitMessage = "${{ github.event.head_commit.message }}"
-          if (-not $commitMessage) { $commitMessage = "${{ github.event.pull_request.title }}" }
+          $event = Get-Content $env:GITHUB_EVENT_PATH -Raw | ConvertFrom-Json
+          $commitMessage = $event.head_commit.message
+          if (-not $commitMessage) { $commitMessage = $event.pull_request.title }
           if (-not $commitMessage) { $commitMessage = "N/A" }
           $payload = @{
             username = "GitHub Actions"

Source/OptionsMenu.cpp

@@ -499,8 +499,6 @@ std::string cOptionsMenu::FormatValue(const sOptItem& it) const {
 }
 
 void cOptionsMenu::Draw() {
-    const size_t YOffset = PLATFORM_BASED(0, 25);
-
     g_Fodder->mSurface->clearBuffer();
     g_Fodder->mGraphics->SetActiveSpriteSheet(eGFX_BRIEFING);
     g_Fodder->GUI_Element_Reset();
@@ -509,7 +507,8 @@ void cOptionsMenu::Draw() {
     g_Fodder->String_Print_Large("OPTIONS", false, 0x01);
     g_Fodder->mString_GapCharID = 0;
 
-    const int rowBaseY = 0x20 + (int)YOffset + 0x10;
+    const int tabY = PLATFORM_BASED(0x1A, 0x18);
+    const int rowBaseY = tabY + 0x18;
     const int rowH = RowH();
     const int16 pageCount = 4;
     const char* pageLabels[pageCount] = { "VID", "IN", "SKIP", "ENG" };
@@ -537,7 +536,6 @@ void cOptionsMenu::Draw() {
 
     // Top page tabs
     {
-        const size_t tabY = 0x10 + YOffset;
         const size_t tabGap = 6;
         const size_t totalW = xRowR - xRowL + 1;
         const size_t tabW = (totalW - (tabGap * (pageCount - 1))) / pageCount;