struct JoystickInfo joystick;
struct SetupInfo setup;
+LevelDirTree *leveldir_first_all = NULL;
LevelDirTree *leveldir_first = NULL;
LevelDirTree *leveldir_current = NULL;
int level_nr;
char *cookie_prefix, char *filename_prefix,
int program_version)
{
- program.command_basename =
- (strrchr(argv0, '/') ? strrchr(argv0, '/') + 1 : argv0);
+ program.command_basepath = getBasePath(argv0);
+ program.command_basename = getBaseName(argv0);
program.userdata_directory = userdata_directory;
program.program_title = program_title;
void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask)
{
- static Bitmap *main_bitmap_tile = NULL;
- static Bitmap *door_bitmap_tile = NULL;
-
- if (mask == REDRAW_FIELD)
- {
- if (background_bitmap_tile == main_bitmap_tile)
- return; /* main background tile has not changed */
-
- main_bitmap_tile = background_bitmap_tile;
- }
- else if (mask == REDRAW_DOOR_1)
- {
- if (background_bitmap_tile == door_bitmap_tile)
- return; /* main background tile has not changed */
-
- door_bitmap_tile = background_bitmap_tile;
- }
- else /* should not happen */
- return;
-
- if (background_bitmap_tile)
+ if (background_bitmap_tile != NULL)
gfx.background_bitmap_mask |= mask;
else
gfx.background_bitmap_mask &= ~mask;
DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile,
gfx.real_sx, gfx.real_sy,
gfx.full_sxsize, gfx.full_sysize);
- else
+ else if (mask == REDRAW_DOOR_1)
+ {
DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile,
gfx.dx, gfx.dy,
gfx.dxsize, gfx.dysize);
+ }
}
void SetMainBackgroundBitmap(Bitmap *background_bitmap_tile)
inline boolean DrawingOnBackground(int x, int y)
{
- return ((gfx.draw_background_mask & gfx.background_bitmap_mask) &&
+ return (CheckDrawingArea(x, y, 1, 1, gfx.background_bitmap_mask) &&
CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask));
}
ClearRectangle(bitmap, x, y, width, height);
}
-#if 0
-#ifndef TARGET_SDL
-static GC last_clip_gc = 0; /* needed for XCopyArea() through clip mask */
-#endif
-#endif
-
inline void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap)
{
#if defined(TARGET_X11)
bitmap->clip_gc = clip_gc;
XSetClipMask(display, bitmap->clip_gc, clip_pixmap);
}
-#if 0
- last_clip_gc = clip_gc;
-#endif
#endif
}
bitmap->clip_gc = clip_gc;
XSetClipOrigin(display, bitmap->clip_gc, clip_x, clip_y);
}
-#if 0
- last_clip_gc = clip_gc;
-#endif
#endif
}
dst_x, dst_y);
}
+inline void DrawSimpleBlackLine(Bitmap *bitmap, int from_x, int from_y,
+ int to_x, int to_y)
+{
+#if defined(TARGET_SDL)
+ SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, BLACK_PIXEL);
+#else
+ X11DrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, BLACK_PIXEL);
+#endif
+}
+
inline void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y,
int to_x, int to_y)
{
return;
}
- if (strcmp(filename, bitmap->source_filename) == 0)
+ if (strEqual(filename, bitmap->source_filename))
{
/* The old and new image are the same (have the same filename and path).
This usually means that this image does not exist in this graphic set
return dst_bitmap;
}
-void CreateBitmapWithSmallBitmaps(Bitmap *old_bitmap, int zoom_factor)
+static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
+ boolean create_small_bitmaps)
{
Bitmap swap_bitmap;
Bitmap *new_bitmap, *tmp_bitmap_1, *tmp_bitmap_2, *tmp_bitmap_8;
int width_1, height_1, width_2, height_2, width_8, height_8;
int new_width, new_height;
+ /* calculate new image dimensions for normal sized image */
width_1 = old_bitmap->width * zoom_factor;
height_1 = old_bitmap->height * zoom_factor;
- width_2 = width_1 / 2;
- height_2 = height_1 / 2;
- width_8 = width_1 / 8;
- height_8 = height_1 / 8;
/* get image with normal size (this might require scaling up) */
if (zoom_factor != 1)
else
tmp_bitmap_1 = old_bitmap;
- /* get image with 1/2 of normal size (for use in the level editor) */
- if (zoom_factor != 2)
- tmp_bitmap_2 = ZoomBitmap(tmp_bitmap_1, width_1 / 2, height_1 / 2);
- else
- tmp_bitmap_2 = old_bitmap;
+ if (create_small_bitmaps)
+ {
+ /* calculate new image dimensions for small images */
+ width_2 = width_1 / 2;
+ height_2 = height_1 / 2;
+ width_8 = width_1 / 8;
+ height_8 = height_1 / 8;
+
+ /* get image with 1/2 of normal size (for use in the level editor) */
+ if (zoom_factor != 2)
+ tmp_bitmap_2 = ZoomBitmap(tmp_bitmap_1, width_1 / 2, height_1 / 2);
+ else
+ tmp_bitmap_2 = old_bitmap;
- /* get image with 1/8 of normal size (for use on the preview screen) */
- if (zoom_factor != 8)
- tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_1, width_1 / 8, height_1 / 8);
- else
- tmp_bitmap_8 = old_bitmap;
+ /* get image with 1/8 of normal size (for use on the preview screen) */
+ if (zoom_factor != 8)
+ tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_1, width_1 / 8, height_1 / 8);
+ else
+ tmp_bitmap_8 = old_bitmap;
+ }
/* if image was scaled up, create new clipmask for normal size image */
if (zoom_factor != 1)
#endif
}
- new_width = width_1;
- new_height = height_1 + (height_1 + 1) / 2; /* prevent odd height */
-
- new_bitmap = CreateBitmap(new_width, new_height, DEFAULT_DEPTH);
-
- BlitBitmap(tmp_bitmap_1, new_bitmap, 0, 0, width_1, height_1, 0, 0);
- BlitBitmap(tmp_bitmap_2, new_bitmap, 0, 0, width_1 / 2, height_1 / 2,
- 0, height_1);
- BlitBitmap(tmp_bitmap_8, new_bitmap, 0, 0, width_1 / 8, height_1 / 8,
- 3 * width_1 / 4, height_1);
+ if (create_small_bitmaps)
+ {
+ new_width = width_1;
+ new_height = height_1 + (height_1 + 1) / 2; /* prevent odd height */
- if (zoom_factor != 1)
- FreeBitmap(tmp_bitmap_1);
+ new_bitmap = CreateBitmap(new_width, new_height, DEFAULT_DEPTH);
- if (zoom_factor != 2)
- FreeBitmap(tmp_bitmap_2);
+ BlitBitmap(tmp_bitmap_1, new_bitmap, 0, 0, width_1, height_1, 0, 0);
+ BlitBitmap(tmp_bitmap_2, new_bitmap, 0, 0, width_1 / 2, height_1 / 2,
+ 0, height_1);
+ BlitBitmap(tmp_bitmap_8, new_bitmap, 0, 0, width_1 / 8, height_1 / 8,
+ 3 * width_1 / 4, height_1);
+ }
+ else
+ {
+ new_width = width_1;
+ new_height = height_1;
- if (zoom_factor != 8)
- FreeBitmap(tmp_bitmap_8);
+ new_bitmap = tmp_bitmap_1; /* directly use tmp_bitmap_1 as new bitmap */
+ }
-#if 0
+ if (create_small_bitmaps)
+ {
+ /* if no small bitmaps created, tmp_bitmap_1 is used as new bitmap now */
+ if (zoom_factor != 1)
+ FreeBitmap(tmp_bitmap_1);
-#if defined(TARGET_SDL)
- /* !!! what about the old old_bitmap->surface ??? FIX ME !!! */
- old_bitmap->surface = new_bitmap->surface;
- new_bitmap->surface = NULL;
-#else
- /* !!! see above !!! */
- old_bitmap->drawable = new_bitmap->drawable;
- new_bitmap->drawable = None;
-#endif
+ if (zoom_factor != 2)
+ FreeBitmap(tmp_bitmap_2);
-#else
+ if (zoom_factor != 8)
+ FreeBitmap(tmp_bitmap_8);
+ }
/* replace image with extended image (containing normal, 1/2 and 1/8 size) */
#if defined(TARGET_SDL)
swap_bitmap.drawable = old_bitmap->drawable;
old_bitmap->drawable = new_bitmap->drawable;
new_bitmap->drawable = swap_bitmap.drawable;
-#endif
-
#endif
old_bitmap->width = new_bitmap->width;
old_bitmap->height = new_bitmap->height;
- FreeBitmap(new_bitmap);
+ FreeBitmap(new_bitmap); /* this actually frees the _old_ bitmap now */
+}
+
+void CreateBitmapWithSmallBitmaps(Bitmap *old_bitmap, int zoom_factor)
+{
+ CreateScaledBitmaps(old_bitmap, zoom_factor, TRUE);
+}
+
+void ScaleBitmap(Bitmap *old_bitmap, int zoom_factor)
+{
+ CreateScaledBitmaps(old_bitmap, zoom_factor, FALSE);
}
/* hot spot */
"0,0"
+
#else
+
/* pixels */
" X ",
"X.X ",
inline Key GetEventKey(KeyEvent *event, boolean with_modifiers)
{
#if defined(TARGET_SDL)
+
#if 0
printf("unicode == '%d', sym == '%d', mod == '0x%04x'\n",
(int)event->keysym.unicode,
return event->keysym.unicode;
else
return event->keysym.sym;
+
#else
+
#if 0
printf("with modifiers == '0x%04x', without modifiers == '0x%04x'\n",
(int)XLookupKeysym(event, event->state),
#elif defined(PLATFORM_MSDOS)
MSDOSInitJoysticks();
#endif
+
+#if 0
+ for (i = 0; i < MAX_PLAYERS; i++)
+ printf("::: Joystick for player %d: %d\n", i, joystick.fd[i]);
+#endif
}
inline boolean ReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2)
projects / rocksndiamonds.git / blobdiff