From 6ff7405d316d36245ee3d84fe50517cfb6fa1f39 Mon Sep 17 00:00:00 2001
From: meowtech <wixetech6969@gmail.com>
Date: Mon, 30 Mar 2026 17:31:03 +0000
Subject: [PATCH] sabijdsads

---
 src/al-util.h       |  2 +-
 src/alstream.h      |  3 ++-
 src/bitmap.cpp      |  2 +-
 src/bitmap.h        |  1 +
 src/disposable.h    |  3 +++
 src/etc.cpp         |  3 ++-
 src/etc.h           |  2 +-
 src/eventthread.cpp | 10 ++++++----
 src/eventthread.h   |  2 +-
 src/filesystem.cpp  |  4 ++--
 src/sharedstate.h   |  3 ++-
 11 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/al-util.h b/src/al-util.h
index 5e7ba78..d8c823f 100644
--- a/src/al-util.h
+++ b/src/al-util.h
@@ -22,7 +22,7 @@
 #ifndef ALUTIL_H
 #define ALUTIL_H
 
-#include <al.h>
+#include <AL/al.h>
 #include <SDL3/SDL_audio.h>
 #include <assert.h>
 
diff --git a/src/alstream.h b/src/alstream.h
index 2d07c57..7e7dede 100644
--- a/src/alstream.h
+++ b/src/alstream.h
@@ -74,7 +74,8 @@ struct ALStream
 	uint64_t procFrames;
 	AL::Buffer::ID lastBuf;
 
-	SDL_IOStream srcOps;
+	// made it pointer, idk if its right. never worked with SDL
+	SDL_IOStream* srcOps;
 
 	struct
 	{
diff --git a/src/bitmap.cpp b/src/bitmap.cpp
index 05b8bb1..28d2de5 100644
--- a/src/bitmap.cpp
+++ b/src/bitmap.cpp
@@ -92,7 +92,7 @@ struct BitmapPrivate
 	 * getPixel calls. Is invalidated any time the bitmap
 	 * is modified */
 	SDL_Surface *surface;
-	SDL_PixelFormat *format;
+	SDL_PixelFormatDetails *format;
 
 	/* The 'tainted' area describes which parts of the
 	 * bitmap are not cleared, ie. don't have 0 opacity.
diff --git a/src/bitmap.h b/src/bitmap.h
index 732e9c6..c7782f6 100644
--- a/src/bitmap.h
+++ b/src/bitmap.h
@@ -26,6 +26,7 @@
 #include "etc-internal.h"
 #include "etc.h"
 
+// #include <sigc++/signal.h>
 #include <sigc++/signal.h>
 
 class Font;
diff --git a/src/disposable.h b/src/disposable.h
index afa39be..b52fd78 100644
--- a/src/disposable.h
+++ b/src/disposable.h
@@ -28,8 +28,11 @@
 #include "graphics.h"
 
 #include <assert.h>
+
 #include <sigc++/signal.h>
+// #include <sigc++2.0/sigc++/signal.h>
 #include <sigc++/connection.h>
+// #include <sigc++2.0/sigc++/connection.h>
 
 class Disposable
 {
diff --git a/src/etc.cpp b/src/etc.cpp
index 7e6c556..fcfd4fd 100644
--- a/src/etc.cpp
+++ b/src/etc.cpp
@@ -24,7 +24,8 @@
 #include "serial-util.h"
 #include "exception.h"
 
-#include <SDL3/SDL_types.h>
+// this file doesn't exist, idk what to do if it, so i'll comment it.
+// #include <SDL3/SDL_types.h>
 #include <SDL3/SDL_pixels.h>
 
 Color::Color(double red, double green, double blue, double alpha)
diff --git a/src/etc.h b/src/etc.h
index eac48c5..bc6b2b0 100644
--- a/src/etc.h
+++ b/src/etc.h
@@ -22,7 +22,7 @@
 #ifndef ETC_H
 #define ETC_H
 
-#include <sigc++/signal.h>
+#include <sigc++-2.0/sigc++/signal.h>
 
 #include "serializable.h"
 #include "etc-internal.h"
diff --git a/src/eventthread.cpp b/src/eventthread.cpp
index 21b2bed..c3796c7 100644
--- a/src/eventthread.cpp
+++ b/src/eventthread.cpp
@@ -30,8 +30,10 @@
 #include <SDL3/SDL_touch.h>
 #include <SDL3/SDL_rect.h>
 
-#include <al.h>
-#include <alc.h>
+// #include <al.h>
+#include <AL/al.h>
+// #include <alc.h>
+#include <AL/alc.h>
 
 #include "sharedstate.h"
 #include "graphics.h"
@@ -123,7 +125,7 @@ void EventThread::process(RGSSThreadData &rtData)
 
 	// XXX this function breaks input focus on OSX
 	#ifndef __APPLE__
-		SDL_SetEventFilter(eventFilter, &rtData);
+		SDL_SetEventFilter(eventFilter, (void*)&rtData);
 	#endif
 
 	fullscreen = rtData.config.fullscreen;
@@ -541,7 +543,7 @@ void EventThread::process(RGSSThreadData &rtData)
 	delete sMenu;
 }
 
-int EventThread::eventFilter(void *data, SDL_Event *event)
+bool EventThread::eventFilter(void *data, SDL_Event *event)
 {
 	RGSSThreadData &rtData = *static_cast<RGSSThreadData*>(data);
 
diff --git a/src/eventthread.h b/src/eventthread.h
index 00ec239..961ef5f 100644
--- a/src/eventthread.h
+++ b/src/eventthread.h
@@ -110,7 +110,7 @@ public:
 	void notifyGameScreenChange(const SDL_Rect &screen);
 
 private:
-	static int eventFilter(void *, SDL_Event*);
+	static bool eventFilter(void *, SDL_Event*);
 
 	void resetInputStates();
 	void setFullscreen(SDL_Window *, bool mode);
diff --git a/src/filesystem.cpp b/src/filesystem.cpp
index 3786ccd..0dd021f 100644
--- a/src/filesystem.cpp
+++ b/src/filesystem.cpp
@@ -143,12 +143,12 @@ static PHYSFS_Io *createSDLRWIo(const char *filename)
 	return io;
 }
 
-static inline PHYSFS_File *sdlPHYS(SDL_IOStream *ops)
+static inline PHYSFS_File *sdlPHYS(SDL_RWops *ops)
 {
 	return static_cast<PHYSFS_File*>(ops->hidden.unknown.data1);
 }
 
-static Sint64 SDL_RWopsSize(SDL_IOStream *ops)
+static Sint64 SDL_RWopsSize(SDL_RWops *ops)
 {
 	PHYSFS_File *f = sdlPHYS(ops);
 
diff --git a/src/sharedstate.h b/src/sharedstate.h
index 62f4c35..fbfbac0 100644
--- a/src/sharedstate.h
+++ b/src/sharedstate.h
@@ -22,7 +22,8 @@
 #ifndef SHAREDSTATE_H
 #define SHAREDSTATE_H
 
-#include <sigc++/signal.h>
+// #include <sigc++/signal.h>
+#include <sigc++-2.0/sigc++/signal.h>
 
 #define shState SharedState::instance
 #define glState shState->_glState()