From e669dac59cd368e931a1b5b473f0085e680d2cd8 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Wed, 1 Apr 2026 07:52:08 -0700
Subject: [PATCH] Revert "Added the '--zoom' command line option"
This reverts commit f0c15067c968e3172e1829f6c81678154a03fc3a.
---
game/Maelstrom_Globals.h | 1 -
game/game.cpp | 2 +-
game/main.cpp | 4 ----
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/game/Maelstrom_Globals.h b/game/Maelstrom_Globals.h
index 0aa6be2c..22a49026 100644
--- a/game/Maelstrom_Globals.h
+++ b/game/Maelstrom_Globals.h
@@ -85,7 +85,6 @@ extern void SetStar(int which);
// in main.cpp :
extern Bool gInitializing;
extern Bool gControlBrakes;
-extern Bool gAlwaysZoom;
extern Bool gNetworkAvailable;
extern Bool gUpdateBuffer;
extern Bool gRunning;
diff --git a/game/game.cpp b/game/game.cpp
index 9a18a2a4..f208b559 100644
--- a/game/game.cpp
+++ b/game/game.cpp
@@ -607,7 +607,7 @@ GamePanelDelegate::UpdateZoom()
// We can zoom if we're on a phone in landscape mode and not local multiplayer
bool zoom = false;
- if (gAlwaysZoom || (IsPhone() && rect.w > rect.h)) {
+ if (IsPhone() && rect.w > rect.h) {
int i;
int local_players = 0;
diff --git a/game/main.cpp b/game/main.cpp
index 1bcf3bd4..a1909085 100644
--- a/game/main.cpp
+++ b/game/main.cpp
@@ -58,7 +58,6 @@ static const char *Version =
// Global variables set in this file...
Bool gInitializing = false;
Bool gControlBrakes = false;
-Bool gAlwaysZoom = false;
Bool gNetworkAvailable = false;
Bool gUpdateBuffer = false;
Bool gDelaySound = false;
@@ -143,7 +142,6 @@ void PrintUsage(const char *progname)
" --windowed # Run Maelstrom in windowed mode\n"
" --geometry WxH # Set the window size to WxH\n"
" --control-brakes # Allow manual brake control\n"
-" --zoom # Zoom in on the ship\n"
);
}
@@ -209,8 +207,6 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
}
} else if ( strcmp(argv[i], "--control-brakes") == 0 ) {
gControlBrakes = true;
- } else if ( strcmp(argv[i], "--zoom") == 0 ) {
- gAlwaysZoom = true;
} else if ( strcmp(argv[i], "-NSDocumentRevisionsDebugMode") == 0 && argv[i+1] ) {
// Ignore Xcode debug option
++i;