projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added overlay touch buttons for door request dialog
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 1d4243db2667c5052b4948793df41d5e58281d2e..1e77ca470bac29a2fb1da646ca27480fc3ef0540 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-275,6
+275,13
@@
static void InitBitmapPointers(void)
void InitImageTextures(void)
{
void InitImageTextures(void)
{
+ static int texture_graphics[] =
+ {
+ IMG_GFX_REQUEST_BUTTON_TOUCH_YES,
+ IMG_GFX_REQUEST_BUTTON_TOUCH_NO,
+ IMG_GFX_REQUEST_BUTTON_TOUCH_CONFIRM,
+ -1
+ };
int i, j, k;
FreeAllImageTextures();
int i, j, k;
FreeAllImageTextures();
@@
-300,6
+307,9
@@
void InitImageTextures(void)
}
}
}
}
}
}
+
+ for (i = 0; texture_graphics[i] > -1; i++)
+ CreateImageTextures(texture_graphics[i]);
}
#if 1
}
#if 1
@@
-1314,6
+1324,7
@@
static void set_graphic_parameters_ext(int graphic, int *parameter,
g->fade_delay = -1;
g->post_delay = -1;
g->auto_delay = -1;
g->fade_delay = -1;
g->post_delay = -1;
g->auto_delay = -1;
+ g->auto_delay_unit = AUTO_DELAY_UNIT_DEFAULT;
g->align = ALIGN_CENTER; // default for title screens
g->valign = VALIGN_MIDDLE; // default for title screens
g->sort_priority = 0; // default for title screens
g->align = ALIGN_CENTER; // default for title screens
g->valign = VALIGN_MIDDLE; // default for title screens
g->sort_priority = 0; // default for title screens
@@
-1475,7
+1486,7
@@
static void set_graphic_parameters_ext(int graphic, int *parameter,
else
g->anim_frames = 1;
else
g->anim_frames = 1;
- if (g->anim_frames
== 0)
// frames must be at least 1
+ if (g->anim_frames
< 1)
// frames must be at least 1
g->anim_frames = 1;
g->anim_frames_per_line =
g->anim_frames = 1;
g->anim_frames_per_line =
@@
-1483,7
+1494,7
@@
static void set_graphic_parameters_ext(int graphic, int *parameter,
parameter[GFX_ARG_FRAMES_PER_LINE] : anim_frames_per_line);
g->anim_delay = parameter[GFX_ARG_DELAY];
parameter[GFX_ARG_FRAMES_PER_LINE] : anim_frames_per_line);
g->anim_delay = parameter[GFX_ARG_DELAY];
- if (g->anim_delay
== 0)
// delay must be at least 1
+ if (g->anim_delay
< 1)
// delay must be at least 1
g->anim_delay = 1;
g->anim_mode = parameter[GFX_ARG_ANIM_MODE];
g->anim_delay = 1;
g->anim_mode = parameter[GFX_ARG_ANIM_MODE];
@@
-1551,6
+1562,9
@@
static void set_graphic_parameters_ext(int graphic, int *parameter,
g->x = parameter[GFX_ARG_X]; // (may be uninitialized,
g->y = parameter[GFX_ARG_Y]; // unlike src_x and src_y)
g->x = parameter[GFX_ARG_X]; // (may be uninitialized,
g->y = parameter[GFX_ARG_Y]; // unlike src_x and src_y)
+ if (g->step_delay < 1) // delay must be at least 1
+ g->step_delay = 1;
+
// this is only used for drawing font characters
g->draw_xoffset = parameter[GFX_ARG_DRAW_XOFFSET];
g->draw_yoffset = parameter[GFX_ARG_DRAW_YOFFSET];
// this is only used for drawing font characters
g->draw_xoffset = parameter[GFX_ARG_DRAW_XOFFSET];
g->draw_yoffset = parameter[GFX_ARG_DRAW_YOFFSET];
@@
-1581,6
+1595,8
@@
static void set_graphic_parameters_ext(int graphic, int *parameter,
g->post_delay = parameter[GFX_ARG_POST_DELAY];
if (parameter[GFX_ARG_AUTO_DELAY] != ARG_UNDEFINED_VALUE)
g->auto_delay = parameter[GFX_ARG_AUTO_DELAY];
g->post_delay = parameter[GFX_ARG_POST_DELAY];
if (parameter[GFX_ARG_AUTO_DELAY] != ARG_UNDEFINED_VALUE)
g->auto_delay = parameter[GFX_ARG_AUTO_DELAY];
+ if (parameter[GFX_ARG_AUTO_DELAY_UNIT] != ARG_UNDEFINED_VALUE)
+ g->auto_delay_unit = parameter[GFX_ARG_AUTO_DELAY_UNIT];
if (parameter[GFX_ARG_ALIGN] != ARG_UNDEFINED_VALUE)
g->align = parameter[GFX_ARG_ALIGN];
if (parameter[GFX_ARG_VALIGN] != ARG_UNDEFINED_VALUE)
if (parameter[GFX_ARG_ALIGN] != ARG_UNDEFINED_VALUE)
g->align = parameter[GFX_ARG_ALIGN];
if (parameter[GFX_ARG_VALIGN] != ARG_UNDEFINED_VALUE)