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

Magic tools: Inline->static for android, corrected paths to avoid double slash which makes SDL2 not loading the stuff from assets.

Browse source 
Thoose changes were already in the SDL2 and android versions, they were reverted somehow...
This commit is contained in:
Pere Pujal i Carabantes 2018-02-28 00:23:15 +01:00
parent f08982ad1f
commit f836cc775a
47 changed files with 144 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

8
magic/src/fold.c
View file

@ -10,6 +10,10 @@
#define FOLD_LEN 80
#ifdef __ANDROID__
#define inline static
#endif
int right_arm_x, right_arm_y, left_arm_x, left_arm_y;
int fold_ox, fold_oy;
int fold_x, fold_y;
@ -72,7 +76,7 @@ int fold_init(magic_api * api)
{
char fname[1024];
snprintf(fname, sizeof(fname), "%s/sounds/magic/fold.wav", api->data_directory);
snprintf(fname, sizeof(fname), "%ssounds/magic/fold.wav", api->data_directory);
fold_snd = Mix_LoadWAV(fname);
return (1);
@ -87,7 +91,7 @@ SDL_Surface *fold_get_icon(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE
{
char fname[1024];
snprintf(fname, sizeof(fname), "%s/images/magic/fold.png", api->data_directory);
snprintf(fname, sizeof(fname), "%simages/magic/fold.png", api->data_directory);
return (IMG_Load(fname));
}