#define DG_BUFFERED 0
#define DG_DIRECT 1
+#define GADGET_DEACTIVATED(g) ((g)->x < 0 || (g)->y < 0)
+
+
static struct GadgetInfo *gadget_list_first_entry = NULL;
static struct GadgetInfo *gadget_list_last_entry = NULL;
static struct GadgetInfo *last_info_gi = NULL;
gi->selectbox.x, gi->selectbox.y);
}
else
+ {
+#if 1
+ int x = gi->x;
+ int y = gi->y;
+
+ redraw_mask |= (IN_GFX_FIELD_FULL(x, y) ? REDRAW_FIELD :
+ IN_GFX_DOOR_1(x, y) ? REDRAW_DOOR_1 :
+ IN_GFX_DOOR_2(x, y) ? REDRAW_DOOR_2 :
+ IN_GFX_DOOR_3(x, y) ? REDRAW_DOOR_3 : REDRAW_ALL);
+#else
redraw_mask |= (gi->x < gfx.sx + gfx.sxsize ? REDRAW_FIELD :
gi->y < gfx.dy + gfx.dysize ? REDRAW_DOOR_1 :
gi->y > gfx.vy ? REDRAW_DOOR_2 : REDRAW_DOOR_3);
+#endif
+ }
}
static int get_minimal_size_for_numeric_input(int minmax_value)
{
struct GadgetInfo *gi_previous = gadget_list_first_entry;
+ if (gi == NULL)
+ return;
+
/* prevent "last_info_gi" from pointing to memory that will be freed */
if (last_info_gi == gi)
last_info_gi = NULL;
static void MapGadgetExt(struct GadgetInfo *gi, boolean redraw)
{
- if (gi == NULL || gi->mapped)
+ if (gi == NULL || gi->mapped || GADGET_DEACTIVATED(gi))
return;
gi->mapped = TRUE;
#define MULTIMAP_PLAYFIELD (1 << 3)
#define MULTIMAP_DOOR_1 (1 << 4)
#define MULTIMAP_DOOR_2 (1 << 5)
+#define MULTIMAP_DOOR_3 (1 << 6)
#define MULTIMAP_ALL (MULTIMAP_PLAYFIELD | \
- MULTIMAP_DOOR_1 | \
- MULTIMAP_DOOR_2)
+ MULTIMAP_DOOR_1 | \
+ MULTIMAP_DOOR_2 | \
+ MULTIMAP_DOOR_3)
static void MultiMapGadgets(int mode)
{
while (gi != NULL)
{
+#if 1
+ int x = gi->x;
+ int y = gi->y;
+
+ if ((mode & MULTIMAP_PLAYFIELD && IN_GFX_FIELD_FULL(x, y)) ||
+ (mode & MULTIMAP_DOOR_1 && IN_GFX_DOOR_1(x, y)) ||
+ (mode & MULTIMAP_DOOR_2 && IN_GFX_DOOR_2(x, y)) ||
+ (mode & MULTIMAP_DOOR_3 && IN_GFX_DOOR_3(x, y)) ||
+ (mode & MULTIMAP_ALL) == MULTIMAP_ALL)
+#else
if ((mode & MULTIMAP_PLAYFIELD &&
gi->x < gfx.sx + gfx.sxsize) ||
(mode & MULTIMAP_DOOR_1 &&
(mode & MULTIMAP_DOOR_2 &&
gi->x >= gfx.dx && gi->y > gfx.dy + gfx.dysize) ||
(mode & MULTIMAP_ALL) == MULTIMAP_ALL)
+#endif
{
if (mode & MULTIMAP_UNMAP)
{