From 8b21a7027491d7e69bb165c0c50b0a23d1c8755e Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Fri, 1 Mar 2024 02:28:21 +0100
Subject: Removed useless MachineInfo queries

One questionable leftover is the Windows version check
---
 StarsEx/AudDlg.cpp       | 1 -
 StarsEx/CtlDlg.cpp       | 1 -
 StarsEx/FirstTimeDlg.cpp | 1 -
 StarsEx/Game.cpp         | 1 -
 StarsEx/NetClientDlg.cpp | 1 -
 StarsEx/NetLobbyDlg.cpp  | 1 -
 StarsEx/NetServerDlg.cpp | 1 -
 StarsEx/NetUnitDlg.cpp   | 1 -
 StarsEx/OptDlg.cpp       | 1 -
 StarsEx/PlayerDlg.cpp    | 1 -
 StarsEx/Starshatter.cpp  | 4 ----
 StarsEx/Terrain.cpp      | 9 +--------
 StarsEx/VidDlg.cpp       | 1 -
 13 files changed, 1 insertion(+), 23 deletions(-)

(limited to 'StarsEx')

diff --git a/StarsEx/AudDlg.cpp b/StarsEx/AudDlg.cpp
index 8bfbba6..35eb56b 100644
--- a/StarsEx/AudDlg.cpp
+++ b/StarsEx/AudDlg.cpp
@@ -20,7 +20,6 @@
 #include "Slider.h"
 #include "Video.h"
 #include "Keyboard.h"
-#include "MachineInfo.h"
 
 // +--------------------------------------------------------------------+
 // DECLARE MAPPING FUNCTIONS:
diff --git a/StarsEx/CtlDlg.cpp b/StarsEx/CtlDlg.cpp
index 2703f4b..8aed322 100644
--- a/StarsEx/CtlDlg.cpp
+++ b/StarsEx/CtlDlg.cpp
@@ -24,7 +24,6 @@
 #include "Video.h"
 #include "Keyboard.h"
 #include "Joystick.h"
-#include "MachineInfo.h"
 #include "Clock.h"
 
 // +--------------------------------------------------------------------+
diff --git a/StarsEx/FirstTimeDlg.cpp b/StarsEx/FirstTimeDlg.cpp
index 710ced6..f410f3a 100644
--- a/StarsEx/FirstTimeDlg.cpp
+++ b/StarsEx/FirstTimeDlg.cpp
@@ -24,7 +24,6 @@
 #include "ComboBox.h"
 #include "Video.h"
 #include "Keyboard.h"
-#include "MachineInfo.h"
 
 // +--------------------------------------------------------------------+
 // DECLARE MAPPING FUNCTIONS:
diff --git a/StarsEx/Game.cpp b/StarsEx/Game.cpp
index 420d7d3..a7fd991 100644
--- a/StarsEx/Game.cpp
+++ b/StarsEx/Game.cpp
@@ -15,7 +15,6 @@
 #include "Panic.h"
 #include "Pcx.h"
 #include "Bitmap.h"
-#include "MachineInfo.h"
 #include "VideoSettings.h"
 #include "ContentBundle.h"
 #include "Clock.h"
diff --git a/StarsEx/NetClientDlg.cpp b/StarsEx/NetClientDlg.cpp
index 00636a7..17a36e0 100644
--- a/StarsEx/NetClientDlg.cpp
+++ b/StarsEx/NetClientDlg.cpp
@@ -27,7 +27,6 @@
 #include "Slider.h"
 #include "Video.h"
 #include "Keyboard.h"
-#include "MachineInfo.h"
 
 // +--------------------------------------------------------------------+
 // DECLARE MAPPING FUNCTIONS:
diff --git a/StarsEx/NetLobbyDlg.cpp b/StarsEx/NetLobbyDlg.cpp
index 23cfaba..b5c9d84 100644
--- a/StarsEx/NetLobbyDlg.cpp
+++ b/StarsEx/NetLobbyDlg.cpp
@@ -28,7 +28,6 @@
 
 #include "Video.h"
 #include "Keyboard.h"
-#include "MachineInfo.h"
 
 // +--------------------------------------------------------------------+
 // DECLARE MAPPING FUNCTIONS:
diff --git a/StarsEx/NetServerDlg.cpp b/StarsEx/NetServerDlg.cpp
index 772f0ac..7747aba 100644
--- a/StarsEx/NetServerDlg.cpp
+++ b/StarsEx/NetServerDlg.cpp
@@ -25,7 +25,6 @@
 #include "ComboBox.h"
 #include "Video.h"
 #include "Keyboard.h"
-#include "MachineInfo.h"
 
 // +--------------------------------------------------------------------+
 // DECLARE MAPPING FUNCTIONS:
diff --git a/StarsEx/NetUnitDlg.cpp b/StarsEx/NetUnitDlg.cpp
index 48048fa..5c4675c 100644
--- a/StarsEx/NetUnitDlg.cpp
+++ b/StarsEx/NetUnitDlg.cpp
@@ -32,7 +32,6 @@
 #include "ContentBundle.h"
 #include "Video.h"
 #include "Keyboard.h"
-#include "MachineInfo.h"
 #include "Clock.h"
 
 // +--------------------------------------------------------------------+
diff --git a/StarsEx/OptDlg.cpp b/StarsEx/OptDlg.cpp
index a1cdb78..ffd53a7 100644
--- a/StarsEx/OptDlg.cpp
+++ b/StarsEx/OptDlg.cpp
@@ -23,7 +23,6 @@
 #include "Slider.h"
 #include "Video.h"
 #include "Keyboard.h"
-#include "MachineInfo.h"
 
 // +--------------------------------------------------------------------+
 // DECLARE MAPPING FUNCTIONS:
diff --git a/StarsEx/PlayerDlg.cpp b/StarsEx/PlayerDlg.cpp
index 34a01cf..cdf7bba 100644
--- a/StarsEx/PlayerDlg.cpp
+++ b/StarsEx/PlayerDlg.cpp
@@ -28,7 +28,6 @@
 #include "Slider.h"
 #include "Video.h"
 #include "Keyboard.h"
-#include "MachineInfo.h"
 #include "WndProc.h"
 
 // +--------------------------------------------------------------------+
diff --git a/StarsEx/Starshatter.cpp b/StarsEx/Starshatter.cpp
index 6b87fb8..b0f7910 100644
--- a/StarsEx/Starshatter.cpp
+++ b/StarsEx/Starshatter.cpp
@@ -81,7 +81,6 @@
 #include "ParseUtil.h"
 #include "Token.h"
 
-#include "MachineInfo.h"
 #include "Game.h"
 #include "GameWinDX9.h"
 #include "Clock.h"
@@ -2269,9 +2268,6 @@ Starshatter::LoadVideoConfig(const char* filename)
     float depth_bias           = video_settings->depth_bias;
     int max_tex_size           = 2048;
 
-    if (MachineInfo::GetCpuSpeed() >= 1000 && MachineInfo::GetTotalRam() > 128)
-    terrain_detail_level = 4;
-
     Terrain::SetDetailLevel(terrain_detail_level);
 
     // read the config file:
diff --git a/StarsEx/Terrain.cpp b/StarsEx/Terrain.cpp
index 4d0a5f9..94035a0 100644
--- a/StarsEx/Terrain.cpp
+++ b/StarsEx/Terrain.cpp
@@ -24,7 +24,6 @@
 #include "Bitmap.h"
 #include "DataLoader.h"
 #include "Game.h"
-#include "MachineInfo.h"
 
 // +--------------------------------------------------------------------+
 
@@ -540,14 +539,8 @@ Terrain::Height(double x, double y) const
 void
 Terrain::SetDetailLevel(int detail)
 {
-    if (detail >= 1 && detail <= 4) {
-
-        // limit detail on low memory machines:
-        if (detail > 3 && MachineInfo::GetTotalRam() < 64)
-        detail = 3;
-
+    if (detail >= 1 && detail <= 4)
         detail_level = detail;
-    }
 }
 
 // +--------------------------------------------------------------------+
diff --git a/StarsEx/VidDlg.cpp b/StarsEx/VidDlg.cpp
index fc50082..7447349 100644
--- a/StarsEx/VidDlg.cpp
+++ b/StarsEx/VidDlg.cpp
@@ -24,7 +24,6 @@
 #include "Video.h"
 #include "VideoSettings.h"
 #include "Keyboard.h"
-#include "MachineInfo.h"
 
 // +--------------------------------------------------------------------+
 // DECLARE MAPPING FUNCTIONS:
-- 
cgit v1.1