From 3163dcf9c4afa17fd51fe92cb1a26daff2bcea6c Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Thu, 15 May 2025 14:35:46 -0400
Subject: [PATCH] Remove bird window shake

sorry jartha
---
 src/d_main.cpp       | 2 --
 src/doomstat.h       | 2 --
 src/i_system.h       | 2 --
 src/p_local.h        | 1 -
 src/p_tick.c         | 2 --
 src/p_user.c         | 1 -
 src/r_main.cpp       | 1 -
 src/sdl/i_system.cpp | 6 ------
 src/sdl/i_video.cpp  | 3 ---
 9 files changed, 20 deletions(-)

diff --git a/src/d_main.cpp b/src/d_main.cpp
index 0a9b105d5..bc3a163f6 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -117,8 +117,6 @@ int SUBVERSION;
 
 // platform independant focus loss
 UINT8 window_notinfocus = false;
-INT32 window_x;
-INT32 window_y;
 
 //
 // DEMO LOOP
diff --git a/src/doomstat.h b/src/doomstat.h
index 1d2e0d785..26920a9f4 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -173,8 +173,6 @@ extern boolean digital_disabled;
 
 extern UINT8 paused; // Game paused?
 extern UINT8 window_notinfocus; // are we in focus? (backend independant -- handles auto pausing and display of "focus lost" message)
-extern INT32 window_x;
-extern INT32 window_y;
 
 extern boolean nodrawers;
 extern boolean noblit;
diff --git a/src/i_system.h b/src/i_system.h
index 028132178..3624fbb03 100644
--- a/src/i_system.h
+++ b/src/i_system.h
@@ -328,8 +328,6 @@ const char *I_ClipboardPaste(void);
 
 void I_RegisterSysCommands(void);
 
-void I_CursedWindowMovement(int xd, int yd);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif
diff --git a/src/p_local.h b/src/p_local.h
index 6f6d64594..f7e4f8285 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -159,7 +159,6 @@ extern consvar_t cv_cam_speed[MAXSPLITSCREENPLAYERS], cv_cam_rotate[MAXSPLITSCRE
 
 extern consvar_t cv_tilting;
 extern consvar_t cv_actionmovie;
-extern consvar_t cv_windowquake;
 
 extern fixed_t t_cam_dist[MAXSPLITSCREENPLAYERS], t_cam_height[MAXSPLITSCREENPLAYERS], t_cam_rotate[MAXSPLITSCREENPLAYERS];
 
diff --git a/src/p_tick.c b/src/p_tick.c
index a845e5da7..47efc765a 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -862,8 +862,6 @@ void P_Ticker(boolean run)
 			quake.x = M_RandomRange(-ir,ir);
 			quake.y = M_RandomRange(-ir,ir);
 			quake.z = M_RandomRange(-ir,ir);
-			if (cv_windowquake.value)
-				I_CursedWindowMovement(FixedInt(quake.x), FixedInt(quake.y));
 			--quake.time;
 		}
 		else
diff --git a/src/p_user.c b/src/p_user.c
index b3c51483a..1ca792ccf 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -2644,7 +2644,6 @@ consvar_t cv_cam_rotate[MAXSPLITSCREENPLAYERS] = {
 consvar_t cv_tilting = CVAR_INIT ("tilting", "On", CV_SAVE, CV_OnOff, NULL);
 
 consvar_t cv_actionmovie = CVAR_INIT ("actionmovie", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_windowquake = CVAR_INIT ("windowquake", "Off", CV_SAVE, CV_OnOff, NULL);
 
 fixed_t t_cam_dist[MAXSPLITSCREENPLAYERS] = {-42,-42,-42,-42};
 fixed_t t_cam_height[MAXSPLITSCREENPLAYERS] = {-42,-42,-42,-42};
diff --git a/src/r_main.cpp b/src/r_main.cpp
index 322c708b8..89f1a2276 100644
--- a/src/r_main.cpp
+++ b/src/r_main.cpp
@@ -1835,7 +1835,6 @@ void R_RegisterEngineStuff(void)
 
 	CV_RegisterVar(&cv_tilting);
 	CV_RegisterVar(&cv_actionmovie);
-	CV_RegisterVar(&cv_windowquake);
 	CV_RegisterVar(&cv_sloperoll);
 
 	CV_RegisterVar(&cv_showhud);
diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp
index 7f73ba17a..d26831bb1 100644
--- a/src/sdl/i_system.cpp
+++ b/src/sdl/i_system.cpp
@@ -1056,12 +1056,6 @@ INT32 I_GetKey (void)
 	return rc;
 }
 
-void
-I_CursedWindowMovement (int xd, int yd)
-{
-	SDL_SetWindowPosition(window, window_x + xd, window_y + yd);
-}
-
 //
 // I_JoyScale
 //
diff --git a/src/sdl/i_video.cpp b/src/sdl/i_video.cpp
index 904e533f2..ee60a1068 100644
--- a/src/sdl/i_video.cpp
+++ b/src/sdl/i_video.cpp
@@ -600,9 +600,6 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
 			break;
 		case SDL_WINDOWEVENT_MAXIMIZED:
 			break;
-		case SDL_WINDOWEVENT_MOVED:
-			window_x = evt.data1;
-			window_y = evt.data2;
 	}
 
 	if (FOCUSUNION == oldfocus) // No state change