notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adapting to SDL2 and Android.

Browse source 
SDL_ANYFORMAT is no more there and the flags field should be 0 in SDL2.
Double / that would be get in the paths poses problems in the emulated filesystem we use for Android assets.
This commit is contained in:
Pere Pujal i Carabantes 2021-02-25 01:17:56 +01:00
parent 00b4aa126f
commit 7b872a02df
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
magic/src/checkerboard.c
View file

@ -74,7 +74,7 @@ int checkerboard_init(magic_api * api)
{ {
char fname[1024]; char fname[1024];
snprintf(fname, sizeof(fname), "%s/sounds/magic/checkerboard.ogg", api->data_directory); snprintf(fname, sizeof(fname), "%ssounds/magic/checkerboard.ogg", api->data_directory);
checkerboard_snd = Mix_LoadWAV(fname); checkerboard_snd = Mix_LoadWAV(fname);
return (1); return (1);
@ -89,7 +89,7 @@ SDL_Surface *checkerboard_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
{ {
char fname[1024]; char fname[1024];
snprintf(fname, sizeof(fname), "%s/images/magic/checkerboard.png", api->data_directory); snprintf(fname, sizeof(fname), "%simages/magic/checkerboard.png", api->data_directory);
return (IMG_Load(fname)); return (IMG_Load(fname));
} }

8
magic/src/clone.c
View file

@ -93,10 +93,10 @@ int clone_init(magic_api * api)
{ {
char fname[1024]; char fname[1024];
snprintf(fname, sizeof(fname), "%s/sounds/magic/clone_start.ogg", api->data_directory); snprintf(fname, sizeof(fname), "%ssounds/magic/clone_start.ogg", api->data_directory);
clone_start_snd = Mix_LoadWAV(fname); clone_start_snd = Mix_LoadWAV(fname);
snprintf(fname, sizeof(fname), "%s/sounds/magic/clone.ogg", api->data_directory); snprintf(fname, sizeof(fname), "%ssounds/magic/clone.ogg", api->data_directory);
clone_snd = Mix_LoadWAV(fname); clone_snd = Mix_LoadWAV(fname);
clone_state = CLONE_READY_TO_START; clone_state = CLONE_READY_TO_START;
@ -121,7 +121,7 @@ SDL_Surface *clone_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
{ {
char fname[1024]; char fname[1024];
snprintf(fname, sizeof(fname), "%s/images/magic/clone.png", api->data_directory); snprintf(fname, sizeof(fname), "%simages/magic/clone.png", api->data_directory);
return (IMG_Load(fname)); return (IMG_Load(fname));
} }
@ -319,7 +319,7 @@ int clone_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_
void clone_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, void clone_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED,
int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED)
{ {
clone_last = SDL_CreateRGBSurface(SDL_ANYFORMAT, canvas->w, canvas->h, canvas->format->BitsPerPixel, clone_last = SDL_CreateRGBSurface(0, canvas->w, canvas->h, canvas->format->BitsPerPixel,
canvas->format->Rmask, canvas->format->Gmask, canvas->format->Bmask, canvas->format->Rmask, canvas->format->Gmask, canvas->format->Bmask,
canvas->format->Amask); canvas->format->Amask);

4
magic/src/pixels.c
View file

@ -73,7 +73,7 @@ int pixels_init(magic_api * api)
{ {
char fname[1024]; char fname[1024];
snprintf(fname, sizeof(fname), "%s/sounds/magic/pixels.ogg", api->data_directory); snprintf(fname, sizeof(fname), "%ssounds/magic/pixels.ogg", api->data_directory);
pixel_snd = Mix_LoadWAV(fname); pixel_snd = Mix_LoadWAV(fname);
return (1); return (1);
@ -95,7 +95,7 @@ SDL_Surface *pixels_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
{ {
char fname[1024]; char fname[1024];
snprintf(fname, sizeof(fname), "%s/images/magic/pixels.png", api->data_directory); snprintf(fname, sizeof(fname), "%simages/magic/pixels.png", api->data_directory);
return (IMG_Load(fname)); return (IMG_Load(fname));
} }