From 3f0e19c4dfd6c95dce537cdc0a19ef902e1ecdcd Mon Sep 17 00:00:00 2001 From: DepressedTWM Date: Wed, 20 May 2026 11:35:44 +0400 Subject: [PATCH] Now i need fix messegeboxes --- binding-mri/niko-binding.cpp | 3 +-- src/aldatasource.h | 3 +-- src/alstream.cpp | 3 +-- src/alstream.h | 3 +-- src/bitmap.h | 6 ++---- src/filesystem.cpp | 6 ++---- src/filesystem.h | 6 ++---- src/main.cpp | 3 +-- src/sdl-util.h | 3 +-- 9 files changed, 12 insertions(+), 24 deletions(-) diff --git a/binding-mri/niko-binding.cpp b/binding-mri/niko-binding.cpp index 6742a56..3fd47f1 100644 --- a/binding-mri/niko-binding.cpp +++ b/binding-mri/niko-binding.cpp @@ -29,8 +29,7 @@ #endif #include -namespace syswm { -} +namespace syswm {} #define NIKO_X (320 - 16) #define NIKO_Y ((13 * 16) * 2) diff --git a/src/aldatasource.h b/src/aldatasource.h index 0e01f02..597bb2f 100644 --- a/src/aldatasource.h +++ b/src/aldatasource.h @@ -57,7 +57,6 @@ struct ALDataSource{ ALDataSource *createSDLSource(SDL_IOStream &ops, const char *extension, uint32_t maxBufSize, bool looped); -ALDataSource *createVorbisSource(SDL_IOStream &ops, - bool looped); +ALDataSource *createVorbisSource(SDL_IOStream &ops, bool looped); #endif // ALDATASOURCE_H diff --git a/src/alstream.cpp b/src/alstream.cpp index c1054a7..46bb3fd 100644 --- a/src/alstream.cpp +++ b/src/alstream.cpp @@ -33,8 +33,7 @@ #include #include -ALStream::ALStream(LoopMode loopMode, - const std::string &threadId) +ALStream::ALStream(LoopMode loopMode, const std::string &threadId) : looped(loopMode == Looped), state(Closed), source(0), diff --git a/src/alstream.h b/src/alstream.h index c446d1b..696118a 100644 --- a/src/alstream.h +++ b/src/alstream.h @@ -85,8 +85,7 @@ struct ALStream{ NotLooped }; - ALStream(LoopMode loopMode, - const std::string &threadId); + ALStream(LoopMode loopMode, const std::string &threadId); ~ALStream(); void close(); diff --git a/src/bitmap.h b/src/bitmap.h index c7782f6..fef102e 100644 --- a/src/bitmap.h +++ b/src/bitmap.h @@ -36,8 +36,7 @@ struct SDL_Surface; struct BitmapPrivate; // FIXME make this class use proper RGSS classes again -class Bitmap : public Disposable -{ +class Bitmap : public Disposable{ public: Bitmap(const char *filename); Bitmap(int width, int height); @@ -84,8 +83,7 @@ public: void hueChange(int hue); - enum TextAlign - { + enum TextAlign{ Left = 0, Center = 1, Right = 2 diff --git a/src/filesystem.cpp b/src/filesystem.cpp index c343c13..dee894c 100644 --- a/src/filesystem.cpp +++ b/src/filesystem.cpp @@ -377,8 +377,7 @@ struct CacheEnumData{ } }; -static PHYSFS_EnumerateCallbackResult -cacheEnumCB(void *d, const char *origdir, const char *fname){ +static PHYSFS_EnumerateCallbackResult cacheEnumCB(void *d, const char *origdir, const char *fname){ CacheEnumData &data = *static_cast(d); char fullPath[512]; @@ -433,8 +432,7 @@ struct FontSetsCBData{ SharedFontState *sfs; }; -static PHYSFS_EnumerateCallbackResult -fontSetEnumCB (void *data, const char *dir, const char *fname){ +static PHYSFS_EnumerateCallbackResult fontSetEnumCB (void *data, const char *dir, const char *fname){ FontSetsCBData *d = static_cast(data); /* Only consider filenames with font extensions */ diff --git a/src/filesystem.h b/src/filesystem.h index e524aa9..66f461e 100644 --- a/src/filesystem.h +++ b/src/filesystem.h @@ -53,12 +53,10 @@ public: virtual bool tryRead(SDL_IOStream* &ops, const char *ext) = 0; }; - void openRead(OpenHandler &handler, - const char *filename); + void openRead(OpenHandler &handler, const char *filename); /* Circumvents extension supplementing */ - void openReadRaw(SDL_IOStream* &ops, - const char *filename); + void openReadRaw(SDL_IOStream* &ops, const char *filename); //bool freeOnClose = false); /* Does not perform extension supplementing */ diff --git a/src/main.cpp b/src/main.cpp index 5c7950c..b68438b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -382,8 +382,7 @@ int main(int argc, char *argv[]){ if (!rtData.rgssErrorMsg.empty()){ Debug() << rtData.rgssErrorMsg; - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.windowTitle.c_str(), - rtData.rgssErrorMsg.c_str(), win); + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.windowTitle.c_str(), rtData.rgssErrorMsg.c_str(), win); } /* Clean up any remainin events */ diff --git a/src/sdl-util.h b/src/sdl-util.h index cf3037b..e53ddff 100644 --- a/src/sdl-util.h +++ b/src/sdl-util.h @@ -120,8 +120,7 @@ private: class SDLRWStream{ public: - SDLRWStream(const char *filename, - const char *mode) + SDLRWStream(const char *filename, const char *mode) : ops(SDL_IOFromFile(filename, mode)), buf(ops), s(&buf)