X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=bb5dd45075a1945b90d2acf65df2a00fbda6c391;hb=fffaec4e69e54c74cf5eea689191e81b8c19b85a;hp=183ba2b9a45862ff63d71ee25ca8666d2c405036;hpb=22473d4140e896b64767e3349ef308f69b7668b9;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 183ba2b9..bb5dd450 100644 --- a/src/init.c +++ b/src/init.c @@ -100,7 +100,6 @@ void OpenAll(void) InitGfx(); InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */ InitElementInfo(); - InitGraphicInfo(); InitLevelInfo(); InitLevelArtworkInfo(); @@ -176,16 +175,37 @@ void InitNetworkServer() 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(); } @@ -310,11 +330,11 @@ static void InitTileClipmasks() 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); @@ -497,6 +517,7 @@ void ReloadCustomArtwork() } ReloadCustomImages(); + InitGraphicInfo(); FreeTileClipmasks(); InitTileClipmasks(); @@ -855,22 +876,15 @@ void InitGraphicInfo() /* always start with reliable default values */ for(i=0; i