snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-20 22:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Now i need fix messegeboxes

Browse source
This commit is contained in:
DepressedTWM 2026-05-20 11:35:44 +04:00
parent 2ebe78a1bd
commit 3f0e19c4df
9 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
binding-mri/niko-binding.cpp
View file

@ -29,8 +29,7 @@
#endif #endif
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
namespace syswm { namespace syswm {}
}
#define NIKO_X (320 - 16) #define NIKO_X (320 - 16)
#define NIKO_Y ((13 * 16) * 2) #define NIKO_Y ((13 * 16) * 2)

3
src/aldatasource.h
View file

@ -57,7 +57,6 @@ struct ALDataSource{
ALDataSource *createSDLSource(SDL_IOStream &ops, const char *extension, uint32_t maxBufSize, bool looped); ALDataSource *createSDLSource(SDL_IOStream &ops, const char *extension, uint32_t maxBufSize, bool looped);
ALDataSource *createVorbisSource(SDL_IOStream &ops, ALDataSource *createVorbisSource(SDL_IOStream &ops, bool looped);
bool looped);
#endif // ALDATASOURCE_H #endif // ALDATASOURCE_H

3
src/alstream.cpp
View file

@ -33,8 +33,7 @@
#include <SDL3/SDL_thread.h> #include <SDL3/SDL_thread.h>
#include <SDL3/SDL_timer.h> #include <SDL3/SDL_timer.h>
ALStream::ALStream(LoopMode loopMode, ALStream::ALStream(LoopMode loopMode, const std::string &threadId)
const std::string &threadId)
: looped(loopMode == Looped), : looped(loopMode == Looped),
state(Closed), state(Closed),
source(0), source(0),

3
src/alstream.h
View file

@ -85,8 +85,7 @@ struct ALStream{
NotLooped NotLooped
}; };
ALStream(LoopMode loopMode, ALStream(LoopMode loopMode, const std::string &threadId);
const std::string &threadId);
~ALStream(); ~ALStream();
void close(); void close();

6
src/bitmap.h
View file

@ -36,8 +36,7 @@ struct SDL_Surface;
struct BitmapPrivate; struct BitmapPrivate;
// FIXME make this class use proper RGSS classes again // FIXME make this class use proper RGSS classes again
class Bitmap : public Disposable class Bitmap : public Disposable{
{
public: public:
Bitmap(const char *filename); Bitmap(const char *filename);
Bitmap(int width, int height); Bitmap(int width, int height);
@ -84,8 +83,7 @@ public:
void hueChange(int hue); void hueChange(int hue);
enum TextAlign enum TextAlign{
{
Left = 0, Left = 0,
Center = 1, Center = 1,
Right = 2 Right = 2

6
src/filesystem.cpp
View file

@ -377,8 +377,7 @@ struct CacheEnumData{
} }
}; };
static PHYSFS_EnumerateCallbackResult static PHYSFS_EnumerateCallbackResult cacheEnumCB(void *d, const char *origdir, const char *fname){
cacheEnumCB(void *d, const char *origdir, const char *fname){
CacheEnumData &data = *static_cast<CacheEnumData*>(d); CacheEnumData &data = *static_cast<CacheEnumData*>(d);
char fullPath[512]; char fullPath[512];
@ -433,8 +432,7 @@ struct FontSetsCBData{
SharedFontState *sfs; SharedFontState *sfs;
}; };
static PHYSFS_EnumerateCallbackResult static PHYSFS_EnumerateCallbackResult fontSetEnumCB (void *data, const char *dir, const char *fname){
fontSetEnumCB (void *data, const char *dir, const char *fname){
FontSetsCBData *d = static_cast<FontSetsCBData*>(data); FontSetsCBData *d = static_cast<FontSetsCBData*>(data);
/* Only consider filenames with font extensions */ /* Only consider filenames with font extensions */

6
src/filesystem.h
View file

@ -53,12 +53,10 @@ public:
virtual bool tryRead(SDL_IOStream* &ops, const char *ext) = 0; virtual bool tryRead(SDL_IOStream* &ops, const char *ext) = 0;
}; };
void openRead(OpenHandler &handler, void openRead(OpenHandler &handler, const char *filename);
const char *filename);
/* Circumvents extension supplementing */ /* Circumvents extension supplementing */
void openReadRaw(SDL_IOStream* &ops, void openReadRaw(SDL_IOStream* &ops, const char *filename);
const char *filename);
//bool freeOnClose = false); //bool freeOnClose = false);
/* Does not perform extension supplementing */ /* Does not perform extension supplementing */

3
src/main.cpp
View file

@ -382,8 +382,7 @@ int main(int argc, char *argv[]){
if (!rtData.rgssErrorMsg.empty()){ if (!rtData.rgssErrorMsg.empty()){
Debug() << rtData.rgssErrorMsg; Debug() << rtData.rgssErrorMsg;
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.windowTitle.c_str(), SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.windowTitle.c_str(), rtData.rgssErrorMsg.c_str(), win);
rtData.rgssErrorMsg.c_str(), win);
} }
/* Clean up any remainin events */ /* Clean up any remainin events */

3
src/sdl-util.h
View file

@ -120,8 +120,7 @@ private:
class SDLRWStream{ class SDLRWStream{
public: public:
SDLRWStream(const char *filename, SDLRWStream(const char *filename, const char *mode)
const char *mode)
: ops(SDL_IOFromFile(filename, mode)), : ops(SDL_IOFromFile(filename, mode)),
buf(ops), buf(ops),
s(&buf) s(&buf)