y = WIN_YSIZE / 2 - TILESIZE / 2;
#endif
+ graphic_info = &anim_initial; /* graphic == 0 => anim_initial */
+
#if 0
{
static boolean done = FALSE;
- if (!done)
- printf("::: %d, %d, %d, %d => %d, %d\n",
+ // if (!done)
+ printf("::: %d, %d, %d, %d => %d, %d [%d, %d] [%d, %d]\n",
init.busy.x, init.busy.y,
init.busy.align, init.busy.valign,
- x, y);
+ x, y,
+ graphic_info[graphic].width,
+ graphic_info[graphic].height,
+ sync_frame, anim_initial.anim_delay);
done = TRUE;
}
#endif
- graphic_info = &anim_initial; /* graphic == 0 => anim_initial */
-
if (sync_frame % anim_initial.anim_delay == 0)
+ {
+#if 1
+ Bitmap *src_bitmap;
+ int src_x, src_y;
+ int width = graphic_info[graphic].width;
+ int height = graphic_info[graphic].height;
+ int frame = getGraphicAnimationFrame(graphic, sync_frame);
+
+ getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
+ BlitBitmap(src_bitmap, window, src_x, src_y, width, height, x, y);
+#else
+ /* !!! this can only draw TILEX/TILEY size animations !!! */
DrawGraphicAnimationExt(window, x, y, graphic, sync_frame, NO_MASKING);
+#endif
+ }
graphic_info = graphic_info_last;
return original_height * scale_up_factor;
}
-static void set_graphic_parameters_ext(int graphic, struct GraphicInfo *g,
- int *parameter, Bitmap *src_bitmap)
+static void set_graphic_parameters_ext(int graphic, int *parameter,
+ Bitmap *src_bitmap)
{
+ struct GraphicInfo *g = &graphic_info[graphic];
int anim_frames_per_row = 1, anim_frames_per_col = 1;
int anim_frames_per_line = 1;
int src_image_width = get_scaled_graphic_width(graphic);
int src_image_height = get_scaled_graphic_height(graphic);
+ if (src_image_width == 0 || src_image_height == 0)
+ {
+ /* only happens when loaded outside artwork system (like "global.busy") */
+ src_image_width = src_bitmap->width;
+ src_image_height = src_bitmap->height;
+ }
+
anim_frames_per_row = src_image_width / g->width;
anim_frames_per_col = src_image_height / g->height;
image_config_suffix[i].token,
image_config_suffix[i].type);
- set_graphic_parameters_ext(graphic, &graphic_info[graphic],
- parameter, src_bitmap);
+ set_graphic_parameters_ext(graphic, parameter, src_bitmap);
#else
static void InitMixer()
{
OpenAudio();
+
StartMixer();
}
void InitGfx()
{
+ struct GraphicInfo *graphic_info_last = graphic_info;
char *filename_font_initial = NULL;
char *filename_anim_initial = NULL;
Bitmap *bitmap_font_initial = NULL;
}
}
- set_graphic_parameters_ext(0, &anim_initial, parameter, NULL);
+#if defined(CREATE_SPECIAL_EDITION_RND_JUE)
+ filename_anim_initial = "loading.pcx";
+
+ parameter[GFX_ARG_X] = 0;
+ parameter[GFX_ARG_Y] = 0;
+ parameter[GFX_ARG_WIDTH] = 128;
+ parameter[GFX_ARG_HEIGHT] = 40;
+ parameter[GFX_ARG_FRAMES] = 32;
+ parameter[GFX_ARG_DELAY] = 4;
+ parameter[GFX_ARG_FRAMES_PER_LINE] = ARG_UNDEFINED_VALUE;
+#endif
if (filename_anim_initial == NULL) /* should not happen */
Error(ERR_EXIT, "cannot get filename for '%s'", CONFIG_TOKEN_GLOBAL_BUSY);
anim_initial.bitmap = LoadCustomImage(filename_anim_initial);
+ graphic_info = &anim_initial; /* graphic == 0 => anim_initial */
+
+ set_graphic_parameters_ext(0, parameter, anim_initial.bitmap);
+
+#if 0
+ printf("::: INIT_GFX: anim_frames_per_line == %d [%d / %d] [%d, %d]\n",
+ graphic_info[0].anim_frames_per_line,
+ get_scaled_graphic_width(0),
+ graphic_info[0].width,
+ getOriginalImageWidthFromImageID(0),
+ graphic_info[0].scale_up_factor);
+#endif
+
+ graphic_info = graphic_info_last;
+
init.busy.width = anim_initial.width;
init.busy.height = anim_initial.height;
LoadLevelSetup_SeriesInfo(); /* last played level info */
}
-void InitLevelArtworkInfo()
+static void InitLevelArtworkInfo()
{
LoadLevelArtworkInfo();
}
{
print_timestamp_init("InitImages");
+#if 0
+ printf("::: leveldir_current->identifier == '%s'\n",
+ leveldir_current == NULL ? "[NULL]" : leveldir_current->identifier);
+ printf("::: leveldir_current->graphics_path == '%s'\n",
+ leveldir_current == NULL ? "[NULL]" : leveldir_current->graphics_path);
+ printf("::: leveldir_current->graphics_set == '%s'\n",
+ leveldir_current == NULL ? "[NULL]" : leveldir_current->graphics_set);
+ printf("::: getLevelArtworkSet(ARTWORK_TYPE_GRAPHICS) == '%s'\n",
+ leveldir_current == NULL ? "[NULL]" : LEVELDIR_ARTWORK_SET(leveldir_current, ARTWORK_TYPE_GRAPHICS));
+#endif
+
setLevelArtworkDir(artwork.gfx_first);
+#if 0
+ printf("::: leveldir_current->identifier == '%s'\n",
+ leveldir_current == NULL ? "[NULL]" : leveldir_current->identifier);
+ printf("::: leveldir_current->graphics_path == '%s'\n",
+ leveldir_current == NULL ? "[NULL]" : leveldir_current->graphics_path);
+ printf("::: leveldir_current->graphics_set == '%s'\n",
+ leveldir_current == NULL ? "[NULL]" : leveldir_current->graphics_set);
+ printf("::: getLevelArtworkSet(ARTWORK_TYPE_GRAPHICS) == '%s'\n",
+ leveldir_current == NULL ? "[NULL]" : LEVELDIR_ARTWORK_SET(leveldir_current, ARTWORK_TYPE_GRAPHICS));
+#endif
+
#if 0
printf("::: InitImages for '%s' ['%s', '%s'] ['%s', '%s']\n",
leveldir_current->identifier,
SetupFileHash *setup_file_hash;
boolean redefined_ce_found = FALSE;
+ /* !!! CACHE THIS BY USING HASH 'filename' => 'true/false' !!! */
+
if ((setup_file_hash = loadSetupFileHash(filename)) != NULL)
{
BEGIN_HASH_ITERATION(setup_file_hash, itr)
return redefined_ce_found;
}
-static void InitOverrideArtwork()
+static boolean CheckArtworkTypeForRedefinedCustomElements(int type)
{
- boolean init_override_from_setup = TRUE;
+ char *filename_base, *filename_local;
+ boolean redefined_ce_found = FALSE;
- gfx.override_level_graphics = FALSE;
- gfx.override_level_sounds = FALSE;
- gfx.override_level_music = FALSE;
+ setLevelArtworkDir(ARTWORK_FIRST_NODE(artwork, type));
- if (setup.auto_override_artwork)
- {
- char *filename_base, *filename_local;
- boolean redefined_ce_found = FALSE;
+#if 0
+ printf("::: leveldir_current->identifier == '%s'\n",
+ leveldir_current == NULL ? "[NULL]" : leveldir_current->identifier);
+ printf("::: leveldir_current->graphics_path == '%s'\n",
+ leveldir_current == NULL ? "[NULL]" : leveldir_current->graphics_path);
+ printf("::: leveldir_current->graphics_set == '%s'\n",
+ leveldir_current == NULL ? "[NULL]" : leveldir_current->graphics_set);
+ printf("::: getLevelArtworkSet(ARTWORK_TYPE_GRAPHICS) == '%s'\n",
+ leveldir_current == NULL ? "[NULL]" :
+ LEVELDIR_ARTWORK_SET(leveldir_current, type));
+#endif
- /* first look for special artwork configured in level series config */
- filename_base = getCustomArtworkLevelConfigFilename(ARTWORK_TYPE_GRAPHICS);
+ /* first look for special artwork configured in level series config */
+ filename_base = getCustomArtworkLevelConfigFilename(type);
- if (fileExists(filename_base))
- redefined_ce_found |= CheckArtworkConfigForCustomElements(filename_base);
+#if 0
+ printf("::: filename_base == '%s'\n", filename_base);
+#endif
- filename_local = getCustomArtworkConfigFilename(ARTWORK_TYPE_GRAPHICS);
+ if (fileExists(filename_base))
+ redefined_ce_found |= CheckArtworkConfigForCustomElements(filename_base);
- if (filename_local != NULL && !strEqual(filename_base, filename_local))
- redefined_ce_found |= CheckArtworkConfigForCustomElements(filename_local);
+ filename_local = getCustomArtworkConfigFilename(type);
#if 0
- printf("::: redefined_ce_found == %d\n", redefined_ce_found);
+ printf("::: filename_local == '%s'\n", filename_local);
#endif
- if (!redefined_ce_found)
- {
- gfx.override_level_graphics = TRUE;
- gfx.override_level_sounds = TRUE;
- gfx.override_level_music = TRUE;
+ if (filename_local != NULL && !strEqual(filename_base, filename_local))
+ redefined_ce_found |= CheckArtworkConfigForCustomElements(filename_local);
- init_override_from_setup = FALSE;
- }
- }
+#if 0
+ printf("::: redefined_ce_found == %d\n", redefined_ce_found);
+#endif
- if (init_override_from_setup)
+ return redefined_ce_found;
+}
+
+static void InitOverrideArtwork()
+{
+ boolean redefined_ce_found = FALSE;
+
+ /* to check if this level set redefines any CEs, do not use overriding */
+ gfx.override_level_graphics = FALSE;
+ gfx.override_level_sounds = FALSE;
+ gfx.override_level_music = FALSE;
+
+ /* now check if this level set has definitions for custom elements */
+ if (setup.override_level_graphics == AUTO ||
+ setup.override_level_sounds == AUTO ||
+ setup.override_level_music == AUTO)
+ redefined_ce_found =
+ (CheckArtworkTypeForRedefinedCustomElements(ARTWORK_TYPE_GRAPHICS) |
+ CheckArtworkTypeForRedefinedCustomElements(ARTWORK_TYPE_SOUNDS) |
+ CheckArtworkTypeForRedefinedCustomElements(ARTWORK_TYPE_MUSIC));
+
+#if 0
+ printf("::: redefined_ce_found == %d\n", redefined_ce_found);
+#endif
+
+ if (redefined_ce_found)
+ {
+ /* this level set has CE definitions: change "AUTO" to "FALSE" */
+ gfx.override_level_graphics = (setup.override_level_graphics == TRUE);
+ gfx.override_level_sounds = (setup.override_level_sounds == TRUE);
+ gfx.override_level_music = (setup.override_level_music == TRUE);
+ }
+ else
{
- gfx.override_level_graphics = setup.override_level_graphics;
- gfx.override_level_sounds = setup.override_level_sounds;
- gfx.override_level_music = setup.override_level_music;
+ /* this level set has no CE definitions: change "AUTO" to "TRUE" */
+ gfx.override_level_graphics = (setup.override_level_graphics != FALSE);
+ gfx.override_level_sounds = (setup.override_level_sounds != FALSE);
+ gfx.override_level_music = (setup.override_level_music != FALSE);
}
+
+#if 0
+ printf("::: => %d, %d, %d\n",
+ gfx.override_level_graphics,
+ gfx.override_level_sounds,
+ gfx.override_level_music);
+#endif
}
static char *getNewArtworkIdentifier(int type)
InitLevelArtworkInfo();
print_timestamp_time("InitLevelArtworkInfo");
+ InitOverrideArtwork(); /* needs to know current level directory */
+ print_timestamp_time("InitOverrideArtwork");
+
InitImages(); /* needs to know current level directory */
print_timestamp_time("InitImages");
projects / rocksndiamonds.git / blobdiff