diff --git a/BeefLibs/SDL2/src/SDL2_image.bf b/BeefLibs/SDL2/src/SDL2_image.bf index f80e86c3..96c3dc9c 100644 --- a/BeefLibs/SDL2/src/SDL2_image.bf +++ b/BeefLibs/SDL2/src/SDL2_image.bf @@ -59,7 +59,7 @@ namespace SDL2 public static extern SDL.Version Linked_Version(); [LinkName("IMG_Init")] - public static extern int Init(InitFlags flags); + public static extern int32 Init(InitFlags flags); [LinkName("IMG_Quit")] public static extern void Quit(); @@ -225,7 +225,7 @@ namespace SDL2 public static extern int32 SavePNG(SDL.Surface* surface, char8* file); [LinkName("IMG_SavePNG_RW")] - public static extern int SavePNG_RW( + public static extern int32 SavePNG_RW( SDL.Surface* surface, SDL.RWOps* dst, int32 freedst @@ -235,7 +235,7 @@ namespace SDL2 public static extern int32 SaveJPG(SDL.Surface* surface, char8* file, int32 quality); [LinkName("IMG_SaveJPG_RW")] - public static extern int SaveJPG_RW( + public static extern int32 SaveJPG_RW( SDL.Surface* surface, SDL.RWOps* dst, int32 freedst, diff --git a/BeefLibs/SDL2/src/SDL2_mixer.bf b/BeefLibs/SDL2/src/SDL2_mixer.bf index 882808e7..c7cb39a5 100644 --- a/BeefLibs/SDL2/src/SDL2_mixer.bf +++ b/BeefLibs/SDL2/src/SDL2_mixer.bf @@ -117,10 +117,10 @@ namespace SDL2 [LinkName("Mix_OpenAudio")] public static extern int32 OpenAudio( - int frequency, + int32 frequency, uint16 format, - int channels, - int chunksize + int32 channels, + int32 chunksize ); [LinkName("Mix_AllocateChannels")] @@ -138,7 +138,7 @@ namespace SDL2 [LinkName("Mix_LoadWAV_RW")] public static extern Chunk* LoadWAV_RW( SDL.RWOps* src, - int freesrc + int32 freesrc ); public static Chunk* LoadWAV(StringView file) @@ -154,7 +154,7 @@ namespace SDL2 public static extern Chunk* QuickLoad_WAV(uint8* mem); [LinkName("Mix_QuickLoad_RAW")] - public static extern Chunk* QuickLoad_RAW(uint8* mem, uint len); + public static extern Chunk* QuickLoad_RAW(uint8* mem, uint32 len); [LinkName("Mix_FreeChunk")] public static extern void FreeChunk(Chunk* chunk); @@ -220,7 +220,7 @@ namespace SDL2 [LinkName("Mix_RegisterEffect")] public static extern int32 RegisterEffect( - int chan, + int32 chan, Mix_EffectFunc_t f, Mix_EffectDone_t d, void* arg // void* @@ -228,7 +228,7 @@ namespace SDL2 [LinkName("Mix_UnregisterEffect")] public static extern int32 UnregisterEffect( - int channel, + int32 channel, Mix_EffectFunc_t f ); @@ -237,14 +237,14 @@ namespace SDL2 [LinkName("Mix_SetPanning")] public static extern int32 SetPanning( - int channel, + int32 channel, uint8 left, uint8 right ); [LinkName("Mix_SetPosition")] public static extern int32 SetPosition( - int channel, + int32 channel, int16 angle, uint8 distance ); @@ -282,18 +282,18 @@ namespace SDL2 /* chunk refers to a Mix_Chunk* */ [LinkName("Mix_PlayChannelTimed")] public static extern int32 PlayChannelTimed( - int channel, + int32 channel, Chunk* chunk, - int loops, - int ticks + int32 loops, + int32 ticks ); /* chunk refers to a Mix_Chunk* */ [LinkName("Mix_PlayChannel")] public static extern int32 PlayChannel( - int channel, + int32 channel, Chunk* chunk, - int loops + int32 loops ); [LinkName("Mix_PlayMusic")] @@ -302,23 +302,23 @@ namespace SDL2 [LinkName("Mix_FadeInMusic")] public static extern int32 FadeInMusic( Music* music, - int loops, - int ms + int32 loops, + int32 ms ); [LinkName("Mix_FadeInMusicPos")] public static extern int32 FadeInMusicPos( Music* music, - int loops, - int ms, + int32 loops, + int32 ms, double position ); public static int32 Mix_FadeInChannel( - int channel, + int32 channel, Chunk* chunk, - int loops, - int ms + int32 loops, + int32 ms ) { return FadeInChannelTimed(channel, chunk, loops, ms, -1); @@ -326,19 +326,19 @@ namespace SDL2 [LinkName("Mix_FadeInChannelTimed")] public static extern int32 FadeInChannelTimed( - int channel, + int32 channel, Chunk* chunk, - int loops, - int ms, - int ticks + int32 loops, + int32 ms, + int32 ticks ); [LinkName("Mix_FadeInChannel")] public static extern int32 FadeInChannel( - int channel, + int32 channel, Chunk* chunk, - int loops, - int ms + int32 loops, + int32 ms ); [LinkName("Mix_Volume")] @@ -348,7 +348,7 @@ namespace SDL2 [LinkName("Mix_VolumeChunk")] public static extern int32 VolumeChunk( Chunk* chunk, - int volume + int32 volume ); [LinkName("Mix_VolumeMusic")] diff --git a/BeefLibs/SDL2/src/SDL2_ttf.bf b/BeefLibs/SDL2/src/SDL2_ttf.bf index 7298cf75..0eac8d9b 100644 --- a/BeefLibs/SDL2/src/SDL2_ttf.bf +++ b/BeefLibs/SDL2/src/SDL2_ttf.bf @@ -89,8 +89,8 @@ namespace SDL2 [LinkName("TTF_OpenFontRW")] public static extern Font* OpenFontRW( SDL.RWOps* src, - int freesrc, - int ptsize + int32 freesrc, + int32 ptsize ); /* IntPtr refers to a TTF_Font* */ @@ -158,19 +158,19 @@ namespace SDL2 public struct Font; [LinkName("TTF_GetFontStyle")] - public static extern int GetFontStyle(Font* font); + public static extern int32 GetFontStyle(Font* font); [LinkName("TTF_SetFontStyle")] public static extern void SetFontStyle(Font* font, int32 style); [LinkName("TTF_GetFontOutline")] - public static extern int GetFontOutline(Font* font); + public static extern int32 GetFontOutline(Font* font); [LinkName("TTF_SetFontOutline")] public static extern void SetFontOutline(Font* font, int32 outline); [LinkName("TTF_GetFontHinting")] - public static extern int GetFontHinting(Font* font); + public static extern int32 GetFontHinting(Font* font); [LinkName("TTF_SetFontHinting")] public static extern void SetFontHinting(Font* font, int32 hinting); @@ -181,8 +181,6 @@ namespace SDL2 [LinkName("TTF_SetFontWrappedAlign")] public static extern void SetFontWrappedAlign(Font* font, int32 align); - - [LinkName("TTF_FontHeight")] public static extern int32 FontHeight(Font* font); @@ -199,13 +197,13 @@ namespace SDL2 public static extern int32 GetFontKerning(Font* font); [LinkName("TTF_SetFontKerning")] - public static extern void SetFontKerning(Font* font, int allowed); + public static extern void SetFontKerning(Font* font, int32 allowed); [LinkName("TTF_FontFaces")] public static extern int64 FontFaces(Font* font); [LinkName("TTF_FontFaceIsFixedWidth")] - public static extern int FontFaceIsFixedWidth(Font* font); + public static extern int32 FontFaceIsFixedWidth(Font* font); [LinkName("TTF_FontFaceFamilyName")] public static extern char8* FontFaceFamilyName(Font* font); @@ -245,16 +243,16 @@ namespace SDL2 public static extern int32 SizeText( Font* font, char8* text, - out int w, - out int h + out int32 w, + out int32 h ); [LinkName("TTF_SizeUTF8")] public static extern int32 SizeUTF8( Font* font, char8* text, - out int w, - out int h + out int32 w, + out int32 h ); [LinkName("TTF_SizeUNICODE")] @@ -340,7 +338,7 @@ namespace SDL2 [LinkName("TTF_RenderGlyph_Solid")] public static extern SDL.Surface* RenderGlyph_Solid( Font* font, - uint ch, + uint16 ch, SDL.Color fg ); @@ -444,7 +442,7 @@ namespace SDL2 Font* font, char8* text, SDL.Color fg, - uint wrapped + uint32 wrapLength ); [LinkName("TTF_RenderUTF8_Blended_Wrapped")] @@ -452,7 +450,7 @@ namespace SDL2 Font* font, char8* text, SDL.Color fg, - uint wrapped + uint32 wrapLength ); [LinkName("TTF_RenderUNICODE_Blended_Wrapped")] @@ -460,7 +458,7 @@ namespace SDL2 Font* font, char8* text, SDL.Color fg, - uint wrapped + uint32 wrapLength ); [LinkName("TTF_RenderGlyph_Blended")] @@ -551,13 +549,13 @@ namespace SDL2 public static extern void Quit(); [LinkName("TTF_WasInit")] - public static extern int WasInit(); + public static extern int32 WasInit(); [LinkName("SDL_GetFontKerningSize")] - public static extern int GetFontKerningSize( + public static extern int32 GetFontKerningSize( Font* font, - int prev_index, - int index + int32 prev_index, + int32 index ); [LinkName("TTF_GetFontKerningSizeGlyphs")] @@ -580,18 +578,18 @@ namespace SDL2 [LinkName("TTF_SetDirection")] public static extern int32 SetDirection( - int direction + int32 direction ); [LinkName("TTF_SetScript")] public static extern int32 SetScript( - int script + int32 script ); [LinkName("TTF_SetFontDirection")] public static extern int32 SetFontDirection( Font* font, - int direction + int32 direction ); [LinkName("TTF_SetFontScriptName")]