X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.c;h=4d2707e982af72a67575e7f4636bd4c27fb99550;hp=c33369729d47972a43a70f223f99cb7df4d3285e;hb=61a2ef633881ce5e865c8747f6393700c870f675;hpb=beb79ae685067eea01929edcd49429469ad550d9 diff --git a/src/main.c b/src/main.c index c3336972..4d2707e9 100644 --- a/src/main.c +++ b/src/main.c @@ -26,7 +26,6 @@ Bitmap *bitmap_db_field; Bitmap *bitmap_db_panel; Bitmap *bitmap_db_door_1; Bitmap *bitmap_db_door_2; -Bitmap *bitmap_db_toons; DrawBuffer *fieldbuffer; DrawBuffer *drawto_field; @@ -144,19 +143,25 @@ struct GlobalInfo global; struct BorderInfo border; struct ViewportInfo viewport; struct TitleFadingInfo fading; +struct TitleFadingInfo title_initial_first_default; struct TitleFadingInfo title_initial_default; +struct TitleFadingInfo title_first_default; struct TitleFadingInfo title_default; -struct TitleMessageInfo titlescreen_initial_default; +struct TitleMessageInfo titlescreen_initial_first_default; struct TitleMessageInfo titlescreen_initial_first[MAX_NUM_TITLE_IMAGES]; +struct TitleMessageInfo titlescreen_initial_default; struct TitleMessageInfo titlescreen_initial[MAX_NUM_TITLE_IMAGES]; -struct TitleMessageInfo titlescreen_default; +struct TitleMessageInfo titlescreen_first_default; struct TitleMessageInfo titlescreen_first[MAX_NUM_TITLE_IMAGES]; +struct TitleMessageInfo titlescreen_default; struct TitleMessageInfo titlescreen[MAX_NUM_TITLE_IMAGES]; -struct TitleMessageInfo titlemessage_initial_default; +struct TitleMessageInfo titlemessage_initial_first_default; struct TitleMessageInfo titlemessage_initial_first[MAX_NUM_TITLE_MESSAGES]; +struct TitleMessageInfo titlemessage_initial_default; struct TitleMessageInfo titlemessage_initial[MAX_NUM_TITLE_MESSAGES]; -struct TitleMessageInfo titlemessage_default; +struct TitleMessageInfo titlemessage_first_default; struct TitleMessageInfo titlemessage_first[MAX_NUM_TITLE_MESSAGES]; +struct TitleMessageInfo titlemessage_default; struct TitleMessageInfo titlemessage[MAX_NUM_TITLE_MESSAGES]; struct TitleMessageInfo readme; struct InitInfo init, init_last; @@ -5574,14 +5579,14 @@ struct FontInfo font_info[NUM_FONTS + 1] = struct GlobalAnimInfo global_anim_info[NUM_GLOBAL_ANIM_TOKENS + 1] = { /* (real) graphic definitions used to define animation graphics */ - { "global.anim_1.gfx", }, - { "global.anim_2.gfx", }, - { "global.anim_3.gfx", }, - { "global.anim_4.gfx", }, - { "global.anim_5.gfx", }, - { "global.anim_6.gfx", }, - { "global.anim_7.gfx", }, - { "global.anim_8.gfx", }, + { "gfx.global.anim_1", }, + { "gfx.global.anim_2", }, + { "gfx.global.anim_3", }, + { "gfx.global.anim_4", }, + { "gfx.global.anim_5", }, + { "gfx.global.anim_6", }, + { "gfx.global.anim_7", }, + { "gfx.global.anim_8", }, /* (dummy) graphic definitions used to define animation controls */ { "global.anim_1", },