static void InitArtworkInfo(void);
static void InitLevelArtworkInfo(void);
static void InitNetworkServer(void);
-static void InitImageConfig();
+static void InitImages(void);
static void InitMixer(void);
static void InitSound(void);
static void InitGfx(void);
InitArtworkInfo(); /* needed before loading gfx, sound & music */
InitCounter();
- InitImageConfig();
InitMixer();
InitJoysticks();
InitRND(NEW_RANDOMIZE);
InitGfx();
InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */
InitElementInfo();
- InitGraphicInfo();
InitLevelInfo();
InitLevelArtworkInfo();
InitGadgets(); /* needs to know number of level series */
+ InitImages(); /* needs to know current level directory */
InitSound(); /* needs to know current level directory */
InitGfxBackground();
#endif
}
-static void InitImageConfig()
+static void InitImages()
{
- InitImageList(image_config, NUM_IMAGE_CONFIG_ENTRIES);
+ static char *suffix_list[] =
+ {
+ ".frame_xpos",
+ ".frame_ypos",
+ ".num_frames",
+ NULL
+ };
+
+ image_files =
+ getFileListFromConfigList(image_config, suffix_list, NUM_IMAGE_FILES);
+
+ InitImageList(image_files, NUM_IMAGE_FILES);
+
+ /* load custom images */
+ ReloadCustomImages();
+ InitGraphicInfo();
}
static void InitMixer()
{
+ static char *suffix_list[] =
+ {
+ NULL
+ };
+
OpenAudio();
- InitSoundList(sound_config, NUM_SOUND_CONFIG_ENTRIES);
+
+ sound_files =
+ getFileListFromConfigList(sound_config, suffix_list, NUM_SOUND_FILES);
+
+ InitSoundList(sound_files, NUM_SOUND_FILES);
StartMixer();
}
clip_gc_values.graphics_exposures = False;
clip_gc_valuemask = GCGraphicsExposures;
- tile_clip_gc =
- XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
+ tile_clip_gc = XCreateGC(display, window->drawable,
+ clip_gc_valuemask, &clip_gc_values);
for(i=0; i<NUM_BITMAPS; i++)
{
/* create graphic context structures needed for clipping */
clip_gc_values.graphics_exposures = False;
clip_gc_valuemask = GCGraphicsExposures;
- copy_clipmask_gc =
- XCreateGC(display, pix[PIX_BACK]->clip_mask,
- clip_gc_valuemask, &clip_gc_values);
+ copy_clipmask_gc = XCreateGC(display, pix[PIX_BACK]->clip_mask,
+ clip_gc_valuemask, &clip_gc_values);
/* create only those clipping Pixmaps we really need */
for(i=0; tile_needs_clipping[i].start>=0; i++)
int tile = tile_needs_clipping[i].start + j;
int graphic = tile;
int src_x, src_y;
- int pixmap_nr;
+ Bitmap *src_bitmap;
Pixmap src_pixmap;
- getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y);
- src_pixmap = pix[pixmap_nr]->clip_mask;
+ getGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+ src_pixmap = src_bitmap->clip_mask;
tile_clipmask[tile] = XCreatePixmap(display, window->drawable,
TILEX, TILEY, 1);
ReloadCustomImage(pix[i], image_filename[i]);
}
+ ReloadCustomImages();
+ InitGraphicInfo();
+
FreeTileClipmasks();
InitTileClipmasks();
InitGfxBackground();
/* always start with reliable default values */
for(i=0; i<MAX_GRAPHICS; i++)
{
- graphic_info[i].bitmap = pix[PIX_SP]; /* graphic that ... */
- graphic_info[i].src_x = 0; /* ... contains ... */
- graphic_info[i].src_y = 0; /* ... empty space. */
+ graphic_info[i].bitmap = NULL;
+ graphic_info[i].src_x = 0;
+ graphic_info[i].src_y = 0;
graphic_info[i].anim_frames = 1;
graphic_info[i].anim_delay = 0;
graphic_info[i].anim_mode = ANIM_NORMAL;
- }
- for(i=0; i<MAX_GRAPHICS; i++)
- {
- int bitmap_nr;
-
- getGraphicSource(i, &bitmap_nr,
+ getGraphicSource(i, &graphic_info[i].bitmap,
&graphic_info[i].src_x, &graphic_info[i].src_y);
-
- graphic_info[i].bitmap = pix[bitmap_nr];
}
}
{
if (strcmp(command, "create graphicsinfo.conf") == 0)
{
- printf("# (Currently only \"name\" and \"sort_priority\" recognized.)\n");
+ int i;
+
+ printf("# You can configure additional/alternative image files here.\n");
+ printf("# (The images below are default and therefore commented out.)\n");
printf("\n");
printf("%s\n", getFormattedSetupEntry("name", "Classic Graphics"));
printf("\n");
printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
+ printf("\n");
+
+ for (i=0; image_config[i].token != NULL; i++)
+ printf("# %s\n",
+ getFormattedSetupEntry(image_config[i].token,
+ image_config[i].value));
}
else if (strcmp(command, "create soundsinfo.conf") == 0)
{
int i;
- printf("# You can configure additional/alternative sound effects here\n");
+ printf("# You can configure additional/alternative sound files here.\n");
printf("# (The sounds below are default and therefore commented out.)\n");
printf("\n");
printf("%s\n", getFormattedSetupEntry("name", "Classic Sounds"));
printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
printf("\n");
- for (i=0; i<NUM_SOUND_CONFIG_ENTRIES; i++)
+ for (i=0; sound_config[i].token != NULL; i++)
printf("# %s\n",
getFormattedSetupEntry(sound_config[i].token,
- sound_config[i].default_filename));
+ sound_config[i].value));
}
else if (strcmp(command, "create musicinfo.conf") == 0)
{
printf("\n");
printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
}
+ else if (strcmp(command, "help") == 0)
+ {
+ printf("The following commands are recognized:\n");
+ printf(" \"create graphicsinfo.conf\"\n");
+ printf(" \"create soundsinfo.conf\"\n");
+ printf(" \"create musicinfo.conf\"\n");
+ }
}
void CloseAllAndExit(int exit_value)
FreeAllMusic();
CloseAudio(); /* called after freeing sounds (needed for SDL) */
+ FreeAllImages();
+
FreeTileClipmasks();
for(i=0; i<NUM_BITMAPS; i++)
FreeBitmap(pix[i]);