Remove conditions

.github/workflows/ci-build.yml

@@ -14,6 +14,27 @@ defaults:
     shell: bash
 
 jobs:
+  mark_deployment_as_started:
+    name: Mark deployment as started
+    runs-on: ubuntu-latest
+    permissions:
+      deployments: write
+      contents: read
+    outputs:
+      deployment_id: ${{ steps.start.outputs.deployment_id }}
+      env: ${{ steps.start.outputs.env }}
+    steps:    
+      - name: start deployment
+        id: start
+        uses: bobheadxi/deployments@v1
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          step: start
+          debug: true
+          env: artifacts-${{ github.event.pull_request.number }}
+
+
+
   static-analysis:
     name: Static analysis
 
@@ -362,6 +383,25 @@ jobs:
           path:  out/build/windows-${{ matrix.arch }}/RelWithDebInfo/fallout2-ce-${{ matrix.arch }}.exe
           retention-days: 7
 
+  mark_deployment_as_completed:
+    name: Mark deployment as completed
+    runs-on: ubuntu-latest
+    permissions:
+      deployments: write
+      contents: read    
+    needs: [mark_deployment_as_started, android, ios, linux, linux-armhf, linux-arm64, macos, windows]
+    steps:    
+      - name: Update deployment status        
+        uses: bobheadxi/deployments@v1
+        with:
+          step: finish
+          status: success
+          debug: true
+          ref: ${{ github.event.pull_request.head.sha }}
+          env: ${{ needs.mark_deployment_as_started.outputs.env }}
+          deployment_id: ${{ needs.mark_deployment_as_started.outputs.deployment_id }}
+          env_url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+
 
   release:
     name: Release Continuous build

src/mouse.cc

@@ -1,7 +1,6 @@
 #include "mouse.h"
 
 #include "color.h"
-#include "debug.h"
 #include "dinput.h"
 #include "input.h"
 #include "kb.h"
@@ -54,10 +53,6 @@ static unsigned char* _mouse_fptr = nullptr;
 // 0x51E2A0
 static double gMouseSensitivity = 1.0;
 
-static double gMouseSensitivityDpiHorizontal = 1.0;
-static double gMouseSensitivityDpiVertical = 1.0;
-double gMouseSensitivityScale2Xoption = 1.0;
-
 // 0x51E2AC
 static int last_buttons = 0;
 
@@ -459,8 +454,8 @@ void _mouse_info()
     }
 
     // Adjust for mouse senstivity.
-    x = (int)(x * gMouseSensitivity * gMouseSensitivityDpiHorizontal * gMouseSensitivityScale2Xoption);
-    y = (int)(y * gMouseSensitivity * gMouseSensitivityDpiVertical * gMouseSensitivityScale2Xoption);
+    x = (int)(x * gMouseSensitivity);
+    y = (int)(y * gMouseSensitivity);
 
     _mouse_simulate_input(x, y, buttons);
 
@@ -681,25 +676,6 @@ void mouseSetSensitivity(double value)
     if (value >= 1.0 && value <= 2.5) {
         gMouseSensitivity = value;
     }
-
-    gMouseSensitivityDpiHorizontal = 1.0;
-    gMouseSensitivityDpiVertical = 1.0;
-    if (gSdlWindow) {
-        int displayIndex = SDL_GetWindowDisplayIndex(gSdlWindow);
-        float ddpi, hdpi, vdpi;
-        if (SDL_GetDisplayDPI(displayIndex, &ddpi, &hdpi, &vdpi) == 0) {
-            hdpi /= 96.0f; // 96 is standard DPI
-            vdpi /= 96.0f; // 96 is standard DPI
-            gMouseSensitivityDpiHorizontal = 1 / hdpi;
-            gMouseSensitivityDpiVertical = 1 / vdpi;
-            debugPrint("Mouse DPI scaling: horizontal = %.2f, vertical = %.2f", hdpi, vdpi);
-            debugPrint("Mouse DPI sensitivity: horizontal = %.2f, vertical = %.2f", gMouseSensitivityDpiHorizontal, gMouseSensitivityDpiVertical);
-        } else {
-            debugPrint("Mouse DPI sensitivity is not available, SDL_GetDisplayDPI failed");
-        }
-    } else {
-        debugPrint("Mouse DPI sensitivity is not available, SDL window is null");
-    }
 }
 
 void mouseGetPositionInWindow(int win, int* x, int* y)

src/mouse.h

@@ -54,7 +54,6 @@ void mouseGetWheel(int* x, int* y);
 void convertMouseWheelToArrowKey(int* keyCodePtr);
 int mouse_get_last_buttons();
 
-extern double gMouseSensitivityScale2Xoption;
 } // namespace fallout
 
 #endif /* FALLOUT_MOUSE_H_ */

src/svga.cc

@@ -6,7 +6,6 @@
 #include <SDL.h>
 
 #include "config.h"
-#include "debug.h"
 #include "draw.h"
 #include "interface.h"
 #include "memory.h"
@@ -187,14 +186,6 @@ int _GNW95_init_mode_ex(int width, int height, int bpp)
     _zero_mem = _GNW95_zero_vid_mem;
     _mouse_blit = _GNW95_ShowRect;
 
-    if (scale != 1) {
-        gMouseSensitivityScale2Xoption = 1.0 / scale;
-        debugPrint("Mouse sensitivity adjusted according to scale into %f\n", gMouseSensitivityScale2Xoption);
-    } else {
-        gMouseSensitivityScale2Xoption = 1.0;
-        debugPrint("Mouse sensitivity not adjusted for 2X scale\n");
-    }
-
     return 0;
 }