InitEventFilter(FilterMouseMotionEvents);
- InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */
+ InitElementProperties();
InitElementInfo();
InitGfx();
InitImages(); /* needs to know current level directory */
InitSound(); /* needs to know current level directory */
-#if 0
- InitGadgets(); /* needs images + number of level series */
-#endif
InitGfxBackground();
InitGraphicInfo(); /* initialize graphic info from config file */
InitFontInfo(bitmap_font_initial,
- new_graphic_info[IMG_MENU_FONT_BIG].bitmap,
- new_graphic_info[IMG_MENU_FONT_MEDIUM].bitmap,
- new_graphic_info[IMG_MENU_FONT_SMALL].bitmap,
- new_graphic_info[IMG_MENU_FONT_EM].bitmap);
+ graphic_info[IMG_FONT_BIG].bitmap,
+ graphic_info[IMG_FONT_MEDIUM].bitmap,
+ graphic_info[IMG_FONT_SMALL].bitmap,
+ graphic_info[IMG_FONT_EM].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()
fieldbuffer = bitmap_db_field;
SetDrawtoField(DRAW_BACKBUFFER);
- BlitBitmap(new_graphic_info[IMG_MENU_FRAME].bitmap, backbuffer,
+ BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer,
0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
ClearRectangle(bitmap_db_door, 0, 0, 3 * DXSIZE, DYSIZE + VYSIZE);
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++)
+ for (act=0; act<NUM_GFX_ACTIONS; act++)
{
element_info[i].graphic[act] = -1;
int action = element_to_graphic[i].action;
int graphic = element_to_graphic[i].graphic;
- if (action > -1)
- action = graphics_action_mapping[action];
- else
+ if (action < 0)
action = GFX_ACTION_DEFAULT;
if (direction > -1)
}
/* 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];
default_action_direction_graphic[dir] = default_action_graphic;
}
- for (act=0; act<NUM_GFX_ACTIONS_MAPPED; act++)
+ for (act=0; act<NUM_GFX_ACTIONS; act++)
{
for (dir=0; dir<NUM_MV_DIRECTIONS; dir++)
{
static void InitGraphicInfo()
{
+ 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;
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+ Pixmap src_pixmap;
+ XGCValues clip_gc_values;
+ unsigned long clip_gc_valuemask;
+ GC copy_clipmask_gc = None;
+#endif
image_files = getCurrentImageList();
i++;
}
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+ if (clipmasks_initialized)
+ {
+ for (i=0; i<NUM_IMAGE_FILES; i++)
+ {
+ if (graphic_info[i].clip_mask)
+ XFreePixmap(display, graphic_info[i].clip_mask);
+ if (graphic_info[i].clip_gc)
+ XFreeGC(display, graphic_info[i].clip_gc);
+
+ graphic_info[i].clip_mask = None;
+ graphic_info[i].clip_gc = None;
+ }
+ }
+#endif
+
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);
+ 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;
- new_graphic_info[i].offset_x = parameter[GFX_ARG_OFFSET];
- new_graphic_info[i].offset_y = 0;
+ graphic_info[i].src_x = parameter[GFX_ARG_XPOS] * TILEX;
+ graphic_info[i].src_y = parameter[GFX_ARG_YPOS] * TILEY;
+ graphic_info[i].offset_x = parameter[GFX_ARG_OFFSET];
+ graphic_info[i].offset_y = 0;
/* animation frames are ordered vertically instead of horizontally */
if (parameter[GFX_ARG_VERTICAL])
{
- new_graphic_info[i].offset_x = 0;
- new_graphic_info[i].offset_y = parameter[GFX_ARG_OFFSET];
+ graphic_info[i].offset_x = 0;
+ graphic_info[i].offset_y = parameter[GFX_ARG_OFFSET];
}
/* optionally, the x and y offset of frames can be specified directly */
if (parameter[GFX_ARG_XOFFSET] != GFX_ARG_UNDEFINED_VALUE)
- new_graphic_info[i].offset_x = parameter[GFX_ARG_XOFFSET];
+ graphic_info[i].offset_x = parameter[GFX_ARG_XOFFSET];
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];
+ graphic_info[i].offset_y = parameter[GFX_ARG_YOFFSET];
+
+ /* automatically determine correct number of frames, if not defined */
+ if (parameter[GFX_ARG_FRAMES] != GFX_ARG_UNDEFINED_VALUE)
+ graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES];
+ else if (parameter[GFX_ARG_XPOS] == 0 && !parameter[GFX_ARG_VERTICAL])
+ graphic_info[i].anim_frames = num_xtiles;
+ else if (parameter[GFX_ARG_YPOS] == 0 && parameter[GFX_ARG_VERTICAL])
+ graphic_info[i].anim_frames = num_ytiles;
+ else
+ 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_delay = 1;
+ graphic_info[i].anim_delay = parameter[GFX_ARG_DELAY];
+ if (graphic_info[i].anim_delay == 0) /* delay must be at least 1 */
+ graphic_info[i].anim_delay = 1;
/* set mode for animation frame order */
if (parameter[GFX_ARG_MODE_LOOP])
- new_graphic_info[i].anim_mode = ANIM_LOOP;
+ graphic_info[i].anim_mode = ANIM_LOOP;
else if (parameter[GFX_ARG_MODE_LINEAR])
- new_graphic_info[i].anim_mode = ANIM_LINEAR;
+ graphic_info[i].anim_mode = ANIM_LINEAR;
else if (parameter[GFX_ARG_MODE_PINGPONG])
- new_graphic_info[i].anim_mode = ANIM_PINGPONG;
+ 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)
- new_graphic_info[i].anim_mode = ANIM_LOOP;
+ graphic_info[i].anim_mode = ANIM_PINGPONG2;
+ else if (parameter[GFX_ARG_MODE_RANDOM])
+ graphic_info[i].anim_mode = ANIM_RANDOM;
+ else if (graphic_info[i].anim_frames > 1)
+ graphic_info[i].anim_mode = ANIM_LOOP;
else
- new_graphic_info[i].anim_mode = ANIM_NONE;
+ graphic_info[i].anim_mode = ANIM_NONE;
/* set additional flag to play animation frames in reverse order */
if (parameter[GFX_ARG_MODE_REVERSE])
- new_graphic_info[i].anim_mode |= ANIM_REVERSE;
+ graphic_info[i].anim_mode |= ANIM_REVERSE;
/* set first frame of animation after determining animation mode */
- new_graphic_info[i].anim_start_frame = parameter[GFX_ARG_START_FRAME];
+ graphic_info[i].anim_start_frame = parameter[GFX_ARG_START_FRAME];
/* automatically determine correct start frame, if not defined */
if (parameter[GFX_ARG_START_FRAME] == GFX_ARG_UNDEFINED_VALUE)
- new_graphic_info[i].anim_start_frame = 0;
- else if (new_graphic_info[i].anim_mode & ANIM_REVERSE)
- new_graphic_info[i].anim_start_frame =
- new_graphic_info[i].anim_frames - parameter[GFX_ARG_START_FRAME] - 1;
+ graphic_info[i].anim_start_frame = 0;
+ else if (graphic_info[i].anim_mode & ANIM_REVERSE)
+ graphic_info[i].anim_start_frame =
+ graphic_info[i].anim_frames - parameter[GFX_ARG_START_FRAME] - 1;
/* animation synchronized with global frame counter, not move position */
- new_graphic_info[i].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
+ graphic_info[i].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
/* set global_sync for all animations with undefined "animation action" */
if (parameter[GFX_ARG_GLOBAL_SYNC] == GFX_ARG_UNDEFINED_VALUE)
- new_graphic_info[i].anim_global_sync =
+ graphic_info[i].anim_global_sync =
(gfx_action[i] == GFX_ACTION_DEFAULT ? TRUE : FALSE);
/* "linear" animations are never globally synchronized */
if (parameter[GFX_ARG_MODE_LINEAR])
- new_graphic_info[i].anim_global_sync = FALSE;
+ graphic_info[i].anim_global_sync = FALSE;
/* now check if no animation frames are outside of the loaded image */
- if (new_graphic_info[i].bitmap == NULL)
- continue; /* skip check for optional images */
+ if (graphic_info[i].bitmap == NULL)
+ continue; /* skip check for optional images that are undefined */
first_frame = 0;
getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y);
src_x, src_y);
}
- last_frame = new_graphic_info[i].anim_frames - 1;
+ last_frame = graphic_info[i].anim_frames - 1;
getGraphicSource(i, last_frame, &src_bitmap, &src_x, &src_y);
if (src_x < 0 || src_y < 0 ||
src_x + TILEX > src_bitmap->width ||
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)
+ /* currently we need only a tile clip mask from the first frame */
+ getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y);
+
+ if (copy_clipmask_gc == None)
+ {
+ clip_gc_values.graphics_exposures = False;
+ clip_gc_valuemask = GCGraphicsExposures;
+ copy_clipmask_gc = XCreateGC(display, src_bitmap->clip_mask,
+ clip_gc_valuemask, &clip_gc_values);
+ }
+
+ graphic_info[i].clip_mask =
+ XCreatePixmap(display, window->drawable, TILEX, TILEY, 1);
+
+ src_pixmap = src_bitmap->clip_mask;
+ XCopyArea(display, src_pixmap, graphic_info[i].clip_mask,
+ copy_clipmask_gc, src_x, src_y, TILEX, TILEY, 0, 0);
+
+ clip_gc_values.graphics_exposures = False;
+ clip_gc_values.clip_mask = graphic_info[i].clip_mask;
+ clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
+ graphic_info[i].clip_gc =
+ XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
+#endif
}
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+ if (copy_clipmask_gc)
+ XFreeGC(display, copy_clipmask_gc);
+#endif
+
+ clipmasks_initialized = TRUE;
}
static void InitSoundInfo()
EL_SAND,
EL_SP_BASE,
EL_SP_BUGGY_BASE,
+ EL_SP_BUGGY_BASE_ACTIVATING,
EL_TRAP,
EL_INVISIBLE_SAND,
EL_INVISIBLE_SAND_ACTIVE
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)
exit(0);
}
+ else if (strncmp(command, "dump level ", 11) == 0)
+ {
+ char *filename = &command[11];
+
+ if (access(filename, F_OK) != 0)
+ Error(ERR_EXIT, "cannot open file '%s'", filename);
+
+ LoadLevelFromFilename(filename);
+ DumpLevel(&level);
+
+ exit(0);
+ }
else if (strncmp(command, "dump tape ", 10) == 0)
{
char *filename = &command[10];
projects / rocksndiamonds.git / blobdiff