MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove SDL functions that don't exist anymore

develop
Myk Taylor 2023-05-22 17:34:00 -07:00
parent 4e48ce64f1
commit 52151b0e98
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/include/modules/DFSDL.h
Unescape Escape View File

@ -39,8 +39,6 @@ bool init(DFHack::color_ostream &out);
void cleanup(); void cleanup();
DFHACK_EXPORT SDL_Surface * DFIMG_Load(const char *file); DFHACK_EXPORT SDL_Surface * DFIMG_Load(const char *file);
DFHACK_EXPORT int DFSDL_SetAlpha(SDL_Surface *surface, uint32_t flag, uint8_t alpha);
DFHACK_EXPORT SDL_Surface * DFSDL_GetVideoSurface(void);
DFHACK_EXPORT SDL_Surface * DFSDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask); DFHACK_EXPORT SDL_Surface * DFSDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
DFHACK_EXPORT SDL_Surface * DFSDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask); DFHACK_EXPORT SDL_Surface * DFSDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
DFHACK_EXPORT int DFSDL_UpperBlit(SDL_Surface *src, const SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect); DFHACK_EXPORT int DFSDL_UpperBlit(SDL_Surface *src, const SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect);

12
library/modules/DFSDL.cpp
Unescape Escape View File

@ -27,8 +27,6 @@ static const std::vector<std::string> SDL_IMAGE_LIBS {
}; };
SDL_Surface * (*g_IMG_Load)(const char *) = nullptr; SDL_Surface * (*g_IMG_Load)(const char *) = nullptr;
int (*g_SDL_SetAlpha)(SDL_Surface *, uint32_t, uint8_t) = nullptr;
SDL_Surface * (*g_SDL_GetVideoSurface)(void) = nullptr;
SDL_Surface * (*g_SDL_CreateRGBSurface)(uint32_t, int, int, int, uint32_t, uint32_t, uint32_t, uint32_t) = nullptr; SDL_Surface * (*g_SDL_CreateRGBSurface)(uint32_t, int, int, int, uint32_t, uint32_t, uint32_t, uint32_t) = nullptr;
SDL_Surface * (*g_SDL_CreateRGBSurfaceFrom)(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) = nullptr; SDL_Surface * (*g_SDL_CreateRGBSurfaceFrom)(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) = nullptr;
int (*g_SDL_UpperBlit)(SDL_Surface *, const SDL_Rect *, SDL_Surface *, SDL_Rect *) = nullptr; int (*g_SDL_UpperBlit)(SDL_Surface *, const SDL_Rect *, SDL_Surface *, SDL_Rect *) = nullptr;
@ -65,8 +63,6 @@ bool DFSDL::init(color_ostream &out) {
} }
bind(g_sdl_image_handle, IMG_Load); bind(g_sdl_image_handle, IMG_Load);
bind(g_sdl_handle, SDL_SetAlpha);
bind(g_sdl_handle, SDL_GetVideoSurface);
bind(g_sdl_handle, SDL_CreateRGBSurface); bind(g_sdl_handle, SDL_CreateRGBSurface);
bind(g_sdl_handle, SDL_CreateRGBSurfaceFrom); bind(g_sdl_handle, SDL_CreateRGBSurfaceFrom);
bind(g_sdl_handle, SDL_UpperBlit); bind(g_sdl_handle, SDL_UpperBlit);
@ -97,14 +93,6 @@ SDL_Surface * DFSDL::DFIMG_Load(const char *file) {
return g_IMG_Load(file); return g_IMG_Load(file);
} }
int DFSDL::DFSDL_SetAlpha(SDL_Surface *surface, uint32_t flag, uint8_t alpha) {
return g_SDL_SetAlpha(surface, flag, alpha);
}
SDL_Surface * DFSDL::DFSDL_GetVideoSurface(void) {
return g_SDL_GetVideoSurface();
}
SDL_Surface * DFSDL::DFSDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) { SDL_Surface * DFSDL::DFSDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) {
return g_SDL_CreateRGBSurface(flags, width, height, depth, Rmask, Gmask, Bmask, Amask); return g_SDL_CreateRGBSurface(flags, width, height, depth, Rmask, Gmask, Bmask, Amask);
} }

2
library/modules/Textures.cpp
Unescape Escape View File

@ -82,7 +82,6 @@ static size_t load_textures(color_ostream & out, const char * fname,
} }
s = canonicalize_format(s); s = canonicalize_format(s);
DFSDL_SetAlpha(s, 0, 255);
int dimx = s->w / TILE_WIDTH_PX; int dimx = s->w / TILE_WIDTH_PX;
int dimy = s->h / TILE_HEIGHT_PX; int dimy = s->h / TILE_HEIGHT_PX;
long count = 0; long count = 0;
@ -92,7 +91,6 @@ static size_t load_textures(color_ostream & out, const char * fname,
TILE_WIDTH_PX, TILE_HEIGHT_PX, 32, TILE_WIDTH_PX, TILE_HEIGHT_PX, 32,
s->format->Rmask, s->format->Gmask, s->format->Bmask, s->format->Rmask, s->format->Gmask, s->format->Bmask,
s->format->Amask); s->format->Amask);
DFSDL_SetAlpha(tile, 0,255);
SDL_Rect vp; SDL_Rect vp;
vp.x = TILE_WIDTH_PX * x; vp.x = TILE_WIDTH_PX * x;
vp.y = TILE_HEIGHT_PX * y; vp.y = TILE_HEIGHT_PX * y;