X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=34673f372ffffac791b2c965d24ea1414262beac;hb=3d52a86d358f5b1a4b36b80df5d659bce1f5a3a6;hp=b65b671974df1b807c771c082078272a5fa6415a;hpb=ef8c5a2593702e86fb1566cfc25dda5f35df2ea0;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index b65b6719..34673f37 100644 --- a/src/init.c +++ b/src/init.c @@ -64,14 +64,17 @@ static void InitLevelInfo(void); static void InitArtworkInfo(void); static void InitLevelArtworkInfo(void); static void InitNetworkServer(void); +static void InitArtworkConfig(void); static void InitImages(void); static void InitMixer(void); static void InitSound(void); +static void InitMusic(void); static void InitGfx(void); static void InitGfxBackground(void); static void InitGadgets(void); static void InitElementProperties(void); -static void InitElementInfo(void); +static void InitElementGraphicInfo(void); +static void InitElementSoundInfo(void); static void InitGraphicInfo(void); static void InitSoundInfo(); static void Execute_Command(char *); @@ -102,9 +105,11 @@ void OpenAll(void) InitSetup(); InitPlayerInfo(); InitArtworkInfo(); /* needed before loading gfx, sound & music */ + InitArtworkConfig(); /* needed before forking sound child process */ + InitMixer(); InitCounter(); - InitMixer(); + InitJoysticks(); InitRND(NEW_RANDOMIZE); @@ -115,7 +120,6 @@ void OpenAll(void) InitEventFilter(FilterMouseMotionEvents); InitElementProperties(); - InitElementInfo(); InitGfx(); @@ -124,6 +128,7 @@ void OpenAll(void) InitImages(); /* needs to know current level directory */ InitSound(); /* needs to know current level directory */ + InitMusic(); /* needs to know current level directory */ InitGfxBackground(); @@ -138,7 +143,7 @@ void OpenAll(void) InitNetworkServer(); } -void InitGlobal() +static void InitGlobal() { global.autoplay_leveldir = NULL; @@ -147,12 +152,12 @@ void InitGlobal() global.fps_slowdown_factor = 1; } -void InitSetup() +static void InitSetup() { LoadSetup(); /* global setup info */ } -void InitPlayerInfo() +static void InitPlayerInfo() { int i; @@ -165,18 +170,45 @@ void InitPlayerInfo() local_player->connected = TRUE; } -void InitLevelInfo() +static void InitLevelInfo() { LoadLevelInfo(); /* global level info */ LoadLevelSetup_LastSeries(); /* last played series info */ LoadLevelSetup_SeriesInfo(); /* last played level info */ } -void InitArtworkInfo() +static void InitArtworkInfo() { LoadArtworkInfo(); } +static void InitArtworkConfig() +{ + static char *element_prefix[MAX_NUM_ELEMENTS + 1]; + static char *sound_class_prefix[MAX_NUM_ELEMENTS + 1]; + static char *action_suffix[NUM_ACTIONS + 1]; + static char *direction_suffix[NUM_DIRECTIONS + 1]; + static char *dummy[1] = { NULL }; + int i; + + for (i=0; iwidth / 2, + tst_bitmap->height / 2); + + BlitBitmap(tmp_bitmap, tst_bitmap, 0, 0, 256, 224, 0, 448); + + FreeBitmap(tmp_bitmap); + } + +#else +#ifdef TARGET_SDL + + { + Bitmap tmp_bitmap; + SDL_Surface *dst = SDLZoomSurface(graphic_info[IMG_SAND].bitmap->surface, + 0.5, 0.5); + tmp_bitmap.surface = dst; + + BlitBitmap(&tmp_bitmap, graphic_info[IMG_SAND].bitmap, + 0, 0, 256, 224, 0, 448); + + SDL_FreeSurface(dst); + } + +#elif defined(PLATFORM_MSDOS) + + stretch_blit((BITMAP *)(graphic_info[IMG_SAND].bitmap->drawable), + (BITMAP *)(graphic_info[IMG_SAND].bitmap->drawable), + 0, 0, 512, 448, + 0, 448, 256, 224); + +#endif +#endif } -static void InitImages() +static void ReinitializeSounds() { - InitImageList(image_config, image_config_suffix, NUM_IMAGE_FILES); + InitElementSoundInfo(); /* initialize element/sound config info */ + InitSoundInfo(); /* initialize sounds info from config file */ - ReinitializeGraphics(); + InitPlaySoundLevel(); /* initialize internal game sound values */ } -static void InitMixer() +static void ReinitializeMusic() { - OpenAudio(); + /* currently nothing to do */ +} - InitSoundList(sound_config, sound_config_suffix, NUM_SOUND_FILES); +static void InitImages() +{ + ReloadCustomImages(); + ReinitializeGraphics(); - StartMixer(); + LoadCustomElementDescriptions(); } static void InitSound() { - /* load custom sounds and music */ - InitReloadSounds(artwork.snd_current->identifier); - InitReloadMusic(artwork.mus_current->identifier); + InitReloadCustomSounds(artwork.snd_current->identifier); + ReinitializeSounds(); +} - InitSoundInfo(); +static void InitMusic() +{ + InitReloadCustomMusic(artwork.mus_current->identifier); + ReinitializeMusic(); } static void InitTileClipmasks() @@ -532,10 +619,6 @@ void ReloadCustomArtwork() if (!validLevelSeries(leveldir_current)) return; -#if 0 - printf("--> '%s'\n", artwork.gfx_current_identifier); -#endif - /* when a new level series was selected, check if there was a change in custom artwork stored in level series directory */ if (leveldir_current_identifier != leveldir_current->identifier) @@ -570,48 +653,25 @@ void ReloadCustomArtwork() last_override_level_graphics != setup.override_level_graphics) { #if 0 - printf("CHANGED GFX: '%s' -> '%s'\n", - artwork.gfx_current_identifier, gfx_new_identifier); -#endif - -#if 0 - int i; + printf("RELOADING GRAPHICS '%s' -> '%s' ('%s')\n", + artwork.gfx_current_identifier, + artwork.gfx_current->identifier, + gfx_new_identifier); #endif setLevelArtworkDir(artwork.gfx_first); ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE); -#if 0 - for (i=0; iidentifier; -#endif last_override_level_graphics = setup.override_level_graphics; redraw_screen = TRUE; @@ -620,12 +680,20 @@ void ReloadCustomArtwork() if (strcmp(artwork.snd_current_identifier, snd_new_identifier) != 0 || last_override_level_sounds != setup.override_level_sounds) { +#if 0 + printf("RELOADING SOUNDS '%s' -> '%s' ('%s')\n", + artwork.snd_current_identifier, + artwork.snd_current->identifier, + snd_new_identifier); +#endif + /* set artwork path to send it to the sound server process */ setLevelArtworkDir(artwork.snd_first); - InitReloadSounds(snd_new_identifier); + InitReloadCustomSounds(snd_new_identifier); + ReinitializeSounds(); - artwork.snd_current_identifier = snd_new_identifier; + artwork.snd_current_identifier = artwork.snd_current->identifier; last_override_level_sounds = setup.override_level_sounds; redraw_screen = TRUE; @@ -637,9 +705,10 @@ void ReloadCustomArtwork() /* set artwork path to send it to the sound server process */ setLevelArtworkDir(artwork.mus_first); - InitReloadMusic(mus_new_identifier); + InitReloadCustomMusic(mus_new_identifier); + ReinitializeMusic(); - artwork.mus_current_identifier = mus_new_identifier; + artwork.mus_current_identifier = artwork.mus_current->identifier; last_override_level_music = setup.override_level_music; redraw_screen = TRUE; @@ -653,10 +722,6 @@ void ReloadCustomArtwork() SetDoorState(DOOR_OPEN_ALL); CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY); } - -#if 0 - printf("<-- '%s'\n", artwork.gfx_current_identifier); -#endif } void FreeGadgets() @@ -684,9 +749,10 @@ void InitGadgets() gadgets_initialized = TRUE; } -void InitElementInfo() +void InitElementGraphicInfo() { - + struct PropertyMapping *property_mapping = getImageListPropertyMapping(); + int num_property_mappings = getImageListPropertyMappingSize(); int i, act, dir; /* set values to -1 to identify later as "uninitialized" values */ @@ -709,27 +775,38 @@ void InitElementInfo() element_info[i].graphic[ACTION_DEFAULT] = IMG_CUSTOM_START + (i - EL_CUSTOM_START); - i = 0; - while (element_to_graphic[i].element > -1) + /* initialize element/graphic mapping from static configuration */ + for (i=0; element_to_graphic[i].element > -1; i++) { int element = element_to_graphic[i].element; - int direction = element_to_graphic[i].direction; int action = element_to_graphic[i].action; + int direction = element_to_graphic[i].direction; int graphic = element_to_graphic[i].graphic; if (action < 0) action = ACTION_DEFAULT; if (direction > -1) - { - direction = MV_DIR_BIT(direction); - element_info[element].direction_graphic[action][direction] = graphic; - } else element_info[element].graphic[action] = graphic; + } + + /* initialize element/graphic mapping from dynamic configuration */ + for (i=0; i < num_property_mappings; i++) + { + int element = property_mapping[i].base_index; + int action = property_mapping[i].ext1_index; + int direction = property_mapping[i].ext2_index; + int graphic = property_mapping[i].artwork_index; + + if (action < 0) + action = ACTION_DEFAULT; - i++; + if (direction > -1) + element_info[element].direction_graphic[action][direction] = graphic; + else + element_info[element].graphic[action] = graphic; } /* now set all '-1' values to element specific default values */ @@ -772,12 +849,88 @@ void InitElementInfo() } } +static void InitElementSoundInfo() +{ + /* soon to come */ +} + +static void set_graphic_parameters(int graphic, int *parameter) +{ + Bitmap *src_bitmap = getBitmapFromImageID(graphic); + int num_xtiles = (src_bitmap ? src_bitmap->width : TILEX) / TILEX; + int num_ytiles = (src_bitmap ? src_bitmap->height * 2 / 3 : TILEY) / TILEY; + + graphic_info[graphic].bitmap = src_bitmap; + + graphic_info[graphic].src_x = parameter[GFX_ARG_XPOS] * TILEX; + graphic_info[graphic].src_y = parameter[GFX_ARG_YPOS] * TILEY; + graphic_info[graphic].offset_x = parameter[GFX_ARG_OFFSET]; + graphic_info[graphic].offset_y = 0; + + /* animation frames are ordered vertically instead of horizontally */ + if (parameter[GFX_ARG_VERTICAL]) + { + graphic_info[graphic].offset_x = 0; + graphic_info[graphic].offset_y = parameter[GFX_ARG_OFFSET]; + } + + /* optionally, the x and y offset of frames can be specified directly */ + if (parameter[GFX_ARG_XOFFSET] != ARG_UNDEFINED_VALUE) + graphic_info[graphic].offset_x = parameter[GFX_ARG_XOFFSET]; + if (parameter[GFX_ARG_YOFFSET] != ARG_UNDEFINED_VALUE) + graphic_info[graphic].offset_y = parameter[GFX_ARG_YOFFSET]; + + /* automatically determine correct number of frames, if not defined */ + if (parameter[GFX_ARG_FRAMES] != ARG_UNDEFINED_VALUE) + graphic_info[graphic].anim_frames = parameter[GFX_ARG_FRAMES]; + else if (parameter[GFX_ARG_XPOS] == 0 && !parameter[GFX_ARG_VERTICAL]) + graphic_info[graphic].anim_frames = num_xtiles; + else if (parameter[GFX_ARG_YPOS] == 0 && parameter[GFX_ARG_VERTICAL]) + graphic_info[graphic].anim_frames = num_ytiles; + else + graphic_info[graphic].anim_frames = 1; + + graphic_info[graphic].anim_delay = parameter[GFX_ARG_DELAY]; + if (graphic_info[graphic].anim_delay == 0) /* delay must be at least 1 */ + graphic_info[graphic].anim_delay = 1; + + /* set mode for animation frame order */ + if (parameter[GFX_ARG_MODE_LOOP]) + graphic_info[graphic].anim_mode = ANIM_LOOP; + else if (parameter[GFX_ARG_MODE_LINEAR]) + graphic_info[graphic].anim_mode = ANIM_LINEAR; + else if (parameter[GFX_ARG_MODE_PINGPONG]) + graphic_info[graphic].anim_mode = ANIM_PINGPONG; + else if (parameter[GFX_ARG_MODE_PINGPONG2]) + graphic_info[graphic].anim_mode = ANIM_PINGPONG2; + else if (parameter[GFX_ARG_MODE_RANDOM]) + graphic_info[graphic].anim_mode = ANIM_RANDOM; + else if (graphic_info[graphic].anim_frames > 1) + graphic_info[graphic].anim_mode = ANIM_LOOP; + else + graphic_info[graphic].anim_mode = ANIM_NONE; + + /* set additional flag to play animation frames in reverse order */ + if (parameter[GFX_ARG_MODE_REVERSE]) + graphic_info[graphic].anim_mode |= ANIM_REVERSE; + + /* automatically determine correct start frame, if not defined */ + if (parameter[GFX_ARG_START_FRAME] == ARG_UNDEFINED_VALUE) + graphic_info[graphic].anim_start_frame = 0; + else if (graphic_info[graphic].anim_mode & ANIM_REVERSE) + graphic_info[graphic].anim_start_frame = + graphic_info[graphic].anim_frames - parameter[GFX_ARG_START_FRAME] - 1; + else + graphic_info[graphic].anim_start_frame = parameter[GFX_ARG_START_FRAME]; + + /* animation synchronized with global frame counter, not move position */ + graphic_info[graphic].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC]; +} + static void InitGraphicInfo() { static boolean clipmasks_initialized = FALSE; - static int gfx_action[NUM_IMAGE_FILES]; - int src_x, src_y; - int first_frame, last_frame; + int num_images = getImageListSize(); int i; #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) Pixmap src_pixmap; @@ -786,31 +939,15 @@ static void InitGraphicInfo() GC copy_clipmask_gc = None; #endif - image_files = getCurrentImageList(); - - /* set temporary graphics action field to default value */ - for (i=0; i -1) - { - int action = element_to_graphic[i].action; - int graphic = element_to_graphic[i].graphic; - - if (action == -1) - action = ACTION_DEFAULT; - - gfx_action[graphic] = action; + if (graphic_info != NULL) + free(graphic_info); - i++; - } + graphic_info = checked_calloc(num_images * sizeof(struct GraphicInfo)); #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) if (clipmasks_initialized) { - for (i=0; iwidth : TILEX) / TILEX; - int num_ytiles = (src_bitmap ? src_bitmap->height * 2 / 3 : TILEY) / TILEY; - int *parameter = image_files[i].parameter; - - graphic_info[i].bitmap = src_bitmap; - - 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]) - { - 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) - graphic_info[i].offset_x = parameter[GFX_ARG_XOFFSET]; - if (parameter[GFX_ARG_YOFFSET] != GFX_ARG_UNDEFINED_VALUE) - 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; - - 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]) - graphic_info[i].anim_mode = ANIM_LOOP; - else if (parameter[GFX_ARG_MODE_LINEAR]) - graphic_info[i].anim_mode = ANIM_LINEAR; - else if (parameter[GFX_ARG_MODE_PINGPONG]) - graphic_info[i].anim_mode = ANIM_PINGPONG; - else if (parameter[GFX_ARG_MODE_PINGPONG2]) - 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 - graphic_info[i].anim_mode = ANIM_NONE; - - /* set additional flag to play animation frames in reverse order */ - if (parameter[GFX_ARG_MODE_REVERSE]) - graphic_info[i].anim_mode |= ANIM_REVERSE; + struct FileInfo *image = getImageListEntry(i); + Bitmap *src_bitmap; + int src_x, src_y; + int first_frame, last_frame; - /* set first frame of animation after determining animation mode */ - 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) - 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 */ - 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) - graphic_info[i].anim_global_sync = - (gfx_action[i] == ACTION_DEFAULT ? TRUE : FALSE); - - /* "linear" animations are never globally synchronized */ - if (parameter[GFX_ARG_MODE_LINEAR]) - graphic_info[i].anim_global_sync = FALSE; + set_graphic_parameters(i, image->parameter); /* now check if no animation frames are outside of the loaded image */ @@ -917,15 +980,21 @@ static void InitGraphicInfo() src_x + TILEX > src_bitmap->width || src_y + TILEY > src_bitmap->height) { - Error(ERR_RETURN, "custom artwork configuration error:"); + Error(ERR_RETURN_LINE, "-"); + Error(ERR_RETURN, "warning: error found in config file:"); Error(ERR_RETURN, "- config file: '%s'", getImageConfigFilename()); Error(ERR_RETURN, "- config token: '%s'", getTokenFromImageID(i)); Error(ERR_RETURN, "- image file: '%s'", src_bitmap->source_filename); - Error(ERR_EXIT, "error: first animation frame out of bounds (%d,%d)", + Error(ERR_RETURN, + "error: first animation frame out of bounds (%d, %d)", src_x, src_y); + Error(ERR_RETURN, "custom graphic rejected for this element/action"); + Error(ERR_RETURN_LINE, "-"); + + set_graphic_parameters(i, image->default_parameter); } last_frame = graphic_info[i].anim_frames - 1; @@ -934,15 +1003,21 @@ static void InitGraphicInfo() src_x + TILEX > src_bitmap->width || src_y + TILEY > src_bitmap->height) { - Error(ERR_RETURN, "custom artwork configuration error:"); + Error(ERR_RETURN_LINE, "-"); + Error(ERR_RETURN, "warning: error found in config file:"); Error(ERR_RETURN, "- config file: '%s'", getImageConfigFilename()); Error(ERR_RETURN, "- config token: '%s'", getTokenFromImageID(i)); Error(ERR_RETURN, "- image file: '%s'", src_bitmap->source_filename); - Error(ERR_EXIT, "error: last animation frame (%d) out of bounds (%d,%d)", + Error(ERR_RETURN, + "error: last animation frame (%d) out of bounds (%d, %d)", last_frame, src_x, src_y); + Error(ERR_RETURN, "custom graphic rejected for this element/action"); + Error(ERR_RETURN_LINE, "-"); + + set_graphic_parameters(i, image->default_parameter); } #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) @@ -980,12 +1055,97 @@ static void InitGraphicInfo() clipmasks_initialized = TRUE; } +static void set_sound_parameters(int sound, int *parameter) +{ + /* explicit loop mode setting in configuration overrides default value */ + if (parameter[SND_ARG_MODE_LOOP] != ARG_UNDEFINED_VALUE) + sound_info[sound].loop = parameter[SND_ARG_MODE_LOOP]; +} + static void InitSoundInfo() { - sound_files = getCurrentSoundList(); + int *sound_effect_properties; + int num_sounds = getSoundListSize(); + int i, j; + + if (sound_info != NULL) + free(sound_info); + + sound_effect_properties = checked_calloc(num_sounds * sizeof(int)); + sound_info = checked_calloc(num_sounds * sizeof(struct SoundInfo)); + + /* initialize sound effect for all elements to "no sound" */ + for (i=0; itoken); + + sound_effect_properties[i] = ACTION_OTHER; + sound_info[i].loop = FALSE; + + /* determine all loop sounds and identify certain sound classes */ + + for (j=0; element_action_info[j].suffix; j++) + { + int len_action_text = strlen(element_action_info[j].suffix); + + if (len_action_text < len_effect_text && + strcmp(&sound->token[len_effect_text - len_action_text], + element_action_info[j].suffix) == 0) + { + sound_effect_properties[i] = element_action_info[j].value; - /* initialize sound effect lookup table for element actions */ - InitGameSound(); + if (element_action_info[j].is_loop_sound) + sound_info[i].loop = TRUE; + } + } + + /* associate elements and some selected sound actions */ + + for (j=0; jtoken, + element_info[j].sound_class_name, len_class_text) == 0 && + sound->token[len_class_text] == '.') + { + int sound_action_value = sound_effect_properties[i]; + + element_info[j].sound[sound_action_value] = i; + } + } + } + + set_sound_parameters(i, sound->parameter); + } + + free(sound_effect_properties); + +#if 0 + /* TEST ONLY */ + { + int element = EL_SAND; + int sound_action = ACTION_DIGGING; + int j = 0; + + while (element_action_info[j].suffix) + { + if (element_action_info[j].value == sound_action) + printf("element %d, sound action '%s' == %d\n", + element, element_action_info[j].suffix, + element_info_[element].sound[sound_action]); + j++; + } + } +#endif } void InitElementProperties()