X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=cfe42f04ce1965c310b2e62bb06d7b472ebd5348;hp=680b2e62170e727c80e515b5bf1cb35925df6187;hb=e357ec2b5e90659499a8f5bd23c5dce6d0769826;hpb=adbac7f8da2ae3ec52cd6f08e8c4c6fedacfc804 diff --git a/src/screens.c b/src/screens.c index 680b2e62..cfe42f04 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1000,8 +1000,6 @@ static boolean visibleTextPos(struct TextPosInfo *pos) static void InitializeMainControls() { - TreeInfo *graphics_current = - getArtworkTreeInfoForUserLevelSet(ARTWORK_TYPE_GRAPHICS); boolean local_team_mode = (!options.network && setup.team_mode); int i; @@ -1020,21 +1018,9 @@ static void InitializeMainControls() main_text_level_imported_by = leveldir_current->imported_by; main_text_level_tested_by = leveldir_current->tested_by; - main_text_title_1 = (leveldir_current->program_title ? - leveldir_current->program_title : - graphics_current->program_title ? - graphics_current->program_title : - setup.internal.program_title); - main_text_title_2 = (leveldir_current->program_copyright ? - leveldir_current->program_copyright : - graphics_current->program_copyright ? - graphics_current->program_copyright : - setup.internal.program_copyright); - main_text_title_3 = (leveldir_current->program_company ? - leveldir_current->program_company : - graphics_current->program_company ? - graphics_current->program_company : - setup.internal.program_company); + main_text_title_1 = getConfigProgramTitleString(); + main_text_title_2 = getConfigProgramCopyrightString(); + main_text_title_3 = getConfigProgramCompanyString(); /* set main control screen positions to dynamically determined values */ for (i = 0; main_controls[i].nr != -1; i++)