new_graphic_info[IMG_FONT_SMALL].bitmap,
new_graphic_info[IMG_FONT_EM].bitmap);
- SetMainBackgroundBitmap(new_graphic_info[IMG_BACKGROUND_DEFAULT].bitmap);
- SetDoorBackgroundBitmap(new_graphic_info[IMG_BACKGROUND_DOOR].bitmap ?
- new_graphic_info[IMG_BACKGROUND_DOOR].bitmap :
- new_graphic_info[IMG_BACKGROUND_DEFAULT].bitmap);
+ SetMainBackgroundImage(IMG_BACKGROUND_DEFAULT);
+ SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
InitGadgets();
InitToons();
static void InitTileClipmasks()
{
+#if 0
#if defined(TARGET_X11)
XGCValues clip_gc_values;
unsigned long clip_gc_valuemask;
#endif /* TARGET_X11_NATIVE */
#endif /* TARGET_X11 */
+#endif
}
void FreeTileClipmasks()
{
+#if 0
#if defined(TARGET_X11)
int i;
#endif
#endif /* TARGET_X11 */
+#endif
}
void InitGfx()
int i, act, dir;
/* set values to -1 to identify later as "uninitialized" values */
- for (i=0; i<MAX_ELEMENTS; i++)
+ for (i=0; i<MAX_NUM_ELEMENTS; i++)
{
for (act=0; act<NUM_GFX_ACTIONS_MAPPED; act++)
{
}
/* now set all '-1' values to element specific default values */
- for (i=0; i<MAX_ELEMENTS; i++)
+ for (i=0; i<MAX_NUM_ELEMENTS; i++)
{
int default_action_graphic = element_info[i].graphic[GFX_ACTION_DEFAULT];
int default_action_direction_graphic[NUM_MV_DIRECTIONS];
{
static boolean clipmasks_initialized = FALSE;
static int gfx_action[NUM_IMAGE_FILES];
- Bitmap *src_bitmap;
int src_x, src_y;
int first_frame, last_frame;
int i;
for (i=0; i<NUM_IMAGE_FILES; i++)
{
+ Bitmap *src_bitmap = getBitmapFromImageID(i);
+ int num_xtiles = (src_bitmap ? src_bitmap->width : TILEX) / TILEX;
+ int num_ytiles = (src_bitmap ? src_bitmap->height * 2 / 3 : TILEY) / TILEY;
int *parameter = image_files[i].parameter;
- new_graphic_info[i].bitmap = getBitmapFromImageID(i);
+ new_graphic_info[i].bitmap = src_bitmap;
new_graphic_info[i].src_x = parameter[GFX_ARG_XPOS] * TILEX;
new_graphic_info[i].src_y = parameter[GFX_ARG_YPOS] * TILEY;
if (parameter[GFX_ARG_YOFFSET] != GFX_ARG_UNDEFINED_VALUE)
new_graphic_info[i].offset_y = parameter[GFX_ARG_YOFFSET];
- new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES];
+ /* automatically determine correct number of frames, if not defined */
+ if (parameter[GFX_ARG_FRAMES] != GFX_ARG_UNDEFINED_VALUE)
+ new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES];
+ else if (parameter[GFX_ARG_XPOS] == 0 && !parameter[GFX_ARG_VERTICAL])
+ new_graphic_info[i].anim_frames = num_xtiles;
+ else if (parameter[GFX_ARG_YPOS] == 0 && parameter[GFX_ARG_VERTICAL])
+ new_graphic_info[i].anim_frames = num_ytiles;
+ else
+ new_graphic_info[i].anim_frames = 1;
new_graphic_info[i].anim_delay = parameter[GFX_ARG_DELAY];
if (new_graphic_info[i].anim_delay == 0) /* delay must be at least 1 */
new_graphic_info[i].anim_mode = ANIM_PINGPONG;
else if (parameter[GFX_ARG_MODE_PINGPONG2])
new_graphic_info[i].anim_mode = ANIM_PINGPONG2;
- else if (parameter[GFX_ARG_FRAMES] > 1)
+ else if (new_graphic_info[i].anim_frames > 1)
new_graphic_info[i].anim_mode = ANIM_LOOP;
else
new_graphic_info[i].anim_mode = ANIM_NONE;
getTokenFromImageID(i));
Error(ERR_RETURN, "- image file: '%s'",
src_bitmap->source_filename);
- Error(ERR_EXIT, "error: last animation frame out of bounds (%d,%d)",
- src_x, src_y);
+ Error(ERR_EXIT, "error: last animation frame (%d) out of bounds (%d,%d)",
+ last_frame, src_x, src_y);
}
#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
static int num_properties1 = SIZEOF_ARRAY(ep1_num, int *);
static int num_properties2 = SIZEOF_ARRAY(ep2_num, int *);
- for (i=0; i<MAX_ELEMENTS; i++)
+ for (i=0; i<MAX_NUM_ELEMENTS; i++)
{
- Elementeigenschaften1[i] = 0;
- Elementeigenschaften2[i] = 0;
+ Properties1[i] = 0;
+ Properties2[i] = 0;
}
for (i=0; i<num_properties1; i++)
for (j=0; j<*(ep1_num[i]); j++)
- Elementeigenschaften1[(ep1_array[i])[j]] |= ep1_bit[i];
+ Properties1[(ep1_array[i])[j]] |= ep1_bit[i];
for (i=0; i<num_properties2; i++)
for (j=0; j<*(ep2_num[i]); j++)
- Elementeigenschaften2[(ep2_array[i])[j]] |= ep2_bit[i];
+ Properties2[(ep2_array[i])[j]] |= ep2_bit[i];
for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
- Elementeigenschaften1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
+ Properties1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
}
void Execute_Command(char *command)