From: Holger Schemel Date: Mon, 7 May 2007 23:29:02 +0000 (+0200) Subject: rnd-20070508-1-src X-Git-Tag: 3.2.4^2~20 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=17c2de428378f092f928b516a5efc93fa12479e7;p=rocksndiamonds.git rnd-20070508-1-src * fixed invisible "joysticks deactivated ..." text on setup input screen --- diff --git a/ChangeLog b/ChangeLog index 9141158e..9c14c0e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2007-05-07 + * fixed invisible "joysticks deactivated ..." text on setup input screen + 2007-04-27 * added use of hashes created from static lists (element tokens, image config, font tokens) to speed up lookup of configuration parameters diff --git a/src/conf_fnt.c b/src/conf_fnt.c index d46a18a4..f23bd997 100644 --- a/src/conf_fnt.c +++ b/src/conf_fnt.c @@ -51,6 +51,10 @@ font_to_graphic[] = FONT_TITLE_2, -1, IMG_FONT_TITLE_2 }, + { + FONT_TITLE_2, GFX_SPECIAL_ARG_SETUP, + IMG_FONT_TITLE_2_SETUP + }, { FONT_MENU_1, -1, IMG_FONT_MENU_1 diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 33bfdba6..f3bebdf5 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -4684,6 +4684,8 @@ struct ConfigInfo image_config[] = { "font.title_2.y", "0" }, { "font.title_2.width", "14" }, { "font.title_2.height", "14" }, + { "font.title_2.SETUP", UNDEFINED_FILENAME }, + { "font.title_2.SETUP.clone_from", "font.text_4" }, { "font.menu_1", "RocksFontBig.pcx" }, { "font.menu_1.x", "0" }, @@ -5296,13 +5298,13 @@ struct ConfigInfo image_config[] = { "menu.leave_menu.fade_delay", "250" }, { "menu.leave_menu.post_delay", "125" }, { "menu.enter_screen.fade_mode", "fade" }, - { "menu.enter_screen.fade_delay", "750" }, + { "menu.enter_screen.fade_delay", "250" }, { "menu.enter_screen.post_delay", "125" }, { "menu.next_screen.fade_mode", "crossfade" }, { "menu.next_screen.fade_delay", "250" }, { "menu.next_screen.post_delay", "125" }, { "menu.leave_screen.fade_mode", "fade" }, - { "menu.leave_screen.fade_delay", "750" }, + { "menu.leave_screen.fade_delay", "250" }, { "menu.leave_screen.post_delay", "125" }, { "menu.enter_screen.SCORES.fade_mode", ARG_DEFAULT }, { "menu.enter_screen.SCORES.fade_delay", ARG_DEFAULT }, diff --git a/src/conf_gfx.h b/src/conf_gfx.h index 61e5a223..cde81fcb 100644 --- a/src/conf_gfx.h +++ b/src/conf_gfx.h @@ -1698,118 +1698,119 @@ #define IMG_FONT_INITIAL_4 1677 #define IMG_FONT_TITLE_1 1678 #define IMG_FONT_TITLE_2 1679 -#define IMG_FONT_MENU_1 1680 -#define IMG_FONT_MENU_1_ACTIVE 1681 -#define IMG_FONT_MENU_2 1682 -#define IMG_FONT_MENU_2_ACTIVE 1683 -#define IMG_FONT_TEXT_1 1684 -#define IMG_FONT_TEXT_1_MAIN 1685 -#define IMG_FONT_TEXT_1_LEVELS 1686 -#define IMG_FONT_TEXT_1_SETUP 1687 -#define IMG_FONT_TEXT_1_PREVIEW 1688 -#define IMG_FONT_TEXT_1_SCORES 1689 -#define IMG_FONT_TEXT_1_ACTIVE_SCORES 1690 -#define IMG_FONT_TEXT_1_PANEL 1691 -#define IMG_FONT_TEXT_1_DOOR 1692 -#define IMG_FONT_TEXT_2 1693 -#define IMG_FONT_TEXT_2_MAIN 1694 -#define IMG_FONT_TEXT_2_LEVELS 1695 -#define IMG_FONT_TEXT_2_SETUP 1696 -#define IMG_FONT_TEXT_2_PREVIEW 1697 -#define IMG_FONT_TEXT_2_SCORES 1698 -#define IMG_FONT_TEXT_2_ACTIVE_SCORES 1699 -#define IMG_FONT_TEXT_3 1700 -#define IMG_FONT_TEXT_3_LEVELS 1701 -#define IMG_FONT_TEXT_3_SETUP 1702 -#define IMG_FONT_TEXT_3_PREVIEW 1703 -#define IMG_FONT_TEXT_3_SCORES 1704 -#define IMG_FONT_TEXT_3_ACTIVE_SCORES 1705 -#define IMG_FONT_TEXT_4 1706 -#define IMG_FONT_TEXT_4_MAIN 1707 -#define IMG_FONT_TEXT_4_LEVELS 1708 -#define IMG_FONT_TEXT_4_SETUP 1709 -#define IMG_FONT_TEXT_4_SCORES 1710 -#define IMG_FONT_TEXT_4_ACTIVE_SCORES 1711 -#define IMG_FONT_ENVELOPE_1 1712 -#define IMG_FONT_ENVELOPE_2 1713 -#define IMG_FONT_ENVELOPE_3 1714 -#define IMG_FONT_ENVELOPE_4 1715 -#define IMG_FONT_INPUT_1 1716 -#define IMG_FONT_INPUT_1_MAIN 1717 -#define IMG_FONT_INPUT_1_ACTIVE 1718 -#define IMG_FONT_INPUT_1_ACTIVE_MAIN 1719 -#define IMG_FONT_INPUT_1_ACTIVE_SETUP 1720 -#define IMG_FONT_INPUT_2 1721 -#define IMG_FONT_INPUT_2_ACTIVE 1722 -#define IMG_FONT_OPTION_OFF 1723 -#define IMG_FONT_OPTION_ON 1724 -#define IMG_FONT_VALUE_1 1725 -#define IMG_FONT_VALUE_2 1726 -#define IMG_FONT_VALUE_OLD 1727 -#define IMG_FONT_LEVEL_NUMBER 1728 -#define IMG_FONT_LEVEL_NUMBER_ACTIVE 1729 -#define IMG_FONT_TAPE_RECORDER 1730 -#define IMG_FONT_GAME_INFO 1731 -#define IMG_FONT_INFO_ELEMENTS 1732 -#define IMG_FONT_INFO_LEVELSET 1733 -#define IMG_GLOBAL_BORDER 1734 -#define IMG_GLOBAL_DOOR 1735 -#define IMG_GLOBAL_BUSY 1736 -#define IMG_EDITOR_ELEMENT_BORDER 1737 -#define IMG_EDITOR_ELEMENT_BORDER_INPUT 1738 -#define IMG_EDITOR_CASCADE_LIST 1739 -#define IMG_EDITOR_CASCADE_LIST_ACTIVE 1740 -#define IMG_BACKGROUND 1741 -#define IMG_BACKGROUND_TITLE_INITIAL 1742 -#define IMG_BACKGROUND_TITLE 1743 -#define IMG_BACKGROUND_MAIN 1744 -#define IMG_BACKGROUND_LEVELS 1745 -#define IMG_BACKGROUND_SCORES 1746 -#define IMG_BACKGROUND_EDITOR 1747 -#define IMG_BACKGROUND_INFO 1748 -#define IMG_BACKGROUND_INFO_ELEMENTS 1749 -#define IMG_BACKGROUND_INFO_MUSIC 1750 -#define IMG_BACKGROUND_INFO_CREDITS 1751 -#define IMG_BACKGROUND_INFO_PROGRAM 1752 -#define IMG_BACKGROUND_INFO_VERSION 1753 -#define IMG_BACKGROUND_INFO_LEVELSET 1754 -#define IMG_BACKGROUND_SETUP 1755 -#define IMG_BACKGROUND_DOOR 1756 -#define IMG_BACKGROUND_TITLESCREEN_INITIAL_1 1757 -#define IMG_BACKGROUND_TITLESCREEN_INITIAL_2 1758 -#define IMG_BACKGROUND_TITLESCREEN_INITIAL_3 1759 -#define IMG_BACKGROUND_TITLESCREEN_INITIAL_4 1760 -#define IMG_BACKGROUND_TITLESCREEN_INITIAL_5 1761 -#define IMG_BACKGROUND_TITLESCREEN_1 1762 -#define IMG_BACKGROUND_TITLESCREEN_2 1763 -#define IMG_BACKGROUND_TITLESCREEN_3 1764 -#define IMG_BACKGROUND_TITLESCREEN_4 1765 -#define IMG_BACKGROUND_TITLESCREEN_5 1766 -#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_1 1767 -#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_2 1768 -#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_3 1769 -#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_4 1770 -#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_5 1771 -#define IMG_BACKGROUND_TITLEMESSAGE_1 1772 -#define IMG_BACKGROUND_TITLEMESSAGE_2 1773 -#define IMG_BACKGROUND_TITLEMESSAGE_3 1774 -#define IMG_BACKGROUND_TITLEMESSAGE_4 1775 -#define IMG_BACKGROUND_TITLEMESSAGE_5 1776 -#define IMG_BACKGROUND_ENVELOPE_1 1777 -#define IMG_BACKGROUND_ENVELOPE_2 1778 -#define IMG_BACKGROUND_ENVELOPE_3 1779 -#define IMG_BACKGROUND_ENVELOPE_4 1780 -#define IMG_TITLESCREEN_INITIAL_1 1781 -#define IMG_TITLESCREEN_INITIAL_2 1782 -#define IMG_TITLESCREEN_INITIAL_3 1783 -#define IMG_TITLESCREEN_INITIAL_4 1784 -#define IMG_TITLESCREEN_INITIAL_5 1785 -#define IMG_TITLESCREEN_1 1786 -#define IMG_TITLESCREEN_2 1787 -#define IMG_TITLESCREEN_3 1788 -#define IMG_TITLESCREEN_4 1789 -#define IMG_TITLESCREEN_5 1790 +#define IMG_FONT_TITLE_2_SETUP 1680 +#define IMG_FONT_MENU_1 1681 +#define IMG_FONT_MENU_1_ACTIVE 1682 +#define IMG_FONT_MENU_2 1683 +#define IMG_FONT_MENU_2_ACTIVE 1684 +#define IMG_FONT_TEXT_1 1685 +#define IMG_FONT_TEXT_1_MAIN 1686 +#define IMG_FONT_TEXT_1_LEVELS 1687 +#define IMG_FONT_TEXT_1_SETUP 1688 +#define IMG_FONT_TEXT_1_PREVIEW 1689 +#define IMG_FONT_TEXT_1_SCORES 1690 +#define IMG_FONT_TEXT_1_ACTIVE_SCORES 1691 +#define IMG_FONT_TEXT_1_PANEL 1692 +#define IMG_FONT_TEXT_1_DOOR 1693 +#define IMG_FONT_TEXT_2 1694 +#define IMG_FONT_TEXT_2_MAIN 1695 +#define IMG_FONT_TEXT_2_LEVELS 1696 +#define IMG_FONT_TEXT_2_SETUP 1697 +#define IMG_FONT_TEXT_2_PREVIEW 1698 +#define IMG_FONT_TEXT_2_SCORES 1699 +#define IMG_FONT_TEXT_2_ACTIVE_SCORES 1700 +#define IMG_FONT_TEXT_3 1701 +#define IMG_FONT_TEXT_3_LEVELS 1702 +#define IMG_FONT_TEXT_3_SETUP 1703 +#define IMG_FONT_TEXT_3_PREVIEW 1704 +#define IMG_FONT_TEXT_3_SCORES 1705 +#define IMG_FONT_TEXT_3_ACTIVE_SCORES 1706 +#define IMG_FONT_TEXT_4 1707 +#define IMG_FONT_TEXT_4_MAIN 1708 +#define IMG_FONT_TEXT_4_LEVELS 1709 +#define IMG_FONT_TEXT_4_SETUP 1710 +#define IMG_FONT_TEXT_4_SCORES 1711 +#define IMG_FONT_TEXT_4_ACTIVE_SCORES 1712 +#define IMG_FONT_ENVELOPE_1 1713 +#define IMG_FONT_ENVELOPE_2 1714 +#define IMG_FONT_ENVELOPE_3 1715 +#define IMG_FONT_ENVELOPE_4 1716 +#define IMG_FONT_INPUT_1 1717 +#define IMG_FONT_INPUT_1_MAIN 1718 +#define IMG_FONT_INPUT_1_ACTIVE 1719 +#define IMG_FONT_INPUT_1_ACTIVE_MAIN 1720 +#define IMG_FONT_INPUT_1_ACTIVE_SETUP 1721 +#define IMG_FONT_INPUT_2 1722 +#define IMG_FONT_INPUT_2_ACTIVE 1723 +#define IMG_FONT_OPTION_OFF 1724 +#define IMG_FONT_OPTION_ON 1725 +#define IMG_FONT_VALUE_1 1726 +#define IMG_FONT_VALUE_2 1727 +#define IMG_FONT_VALUE_OLD 1728 +#define IMG_FONT_LEVEL_NUMBER 1729 +#define IMG_FONT_LEVEL_NUMBER_ACTIVE 1730 +#define IMG_FONT_TAPE_RECORDER 1731 +#define IMG_FONT_GAME_INFO 1732 +#define IMG_FONT_INFO_ELEMENTS 1733 +#define IMG_FONT_INFO_LEVELSET 1734 +#define IMG_GLOBAL_BORDER 1735 +#define IMG_GLOBAL_DOOR 1736 +#define IMG_GLOBAL_BUSY 1737 +#define IMG_EDITOR_ELEMENT_BORDER 1738 +#define IMG_EDITOR_ELEMENT_BORDER_INPUT 1739 +#define IMG_EDITOR_CASCADE_LIST 1740 +#define IMG_EDITOR_CASCADE_LIST_ACTIVE 1741 +#define IMG_BACKGROUND 1742 +#define IMG_BACKGROUND_TITLE_INITIAL 1743 +#define IMG_BACKGROUND_TITLE 1744 +#define IMG_BACKGROUND_MAIN 1745 +#define IMG_BACKGROUND_LEVELS 1746 +#define IMG_BACKGROUND_SCORES 1747 +#define IMG_BACKGROUND_EDITOR 1748 +#define IMG_BACKGROUND_INFO 1749 +#define IMG_BACKGROUND_INFO_ELEMENTS 1750 +#define IMG_BACKGROUND_INFO_MUSIC 1751 +#define IMG_BACKGROUND_INFO_CREDITS 1752 +#define IMG_BACKGROUND_INFO_PROGRAM 1753 +#define IMG_BACKGROUND_INFO_VERSION 1754 +#define IMG_BACKGROUND_INFO_LEVELSET 1755 +#define IMG_BACKGROUND_SETUP 1756 +#define IMG_BACKGROUND_DOOR 1757 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_1 1758 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_2 1759 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_3 1760 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_4 1761 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_5 1762 +#define IMG_BACKGROUND_TITLESCREEN_1 1763 +#define IMG_BACKGROUND_TITLESCREEN_2 1764 +#define IMG_BACKGROUND_TITLESCREEN_3 1765 +#define IMG_BACKGROUND_TITLESCREEN_4 1766 +#define IMG_BACKGROUND_TITLESCREEN_5 1767 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_1 1768 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_2 1769 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_3 1770 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_4 1771 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_5 1772 +#define IMG_BACKGROUND_TITLEMESSAGE_1 1773 +#define IMG_BACKGROUND_TITLEMESSAGE_2 1774 +#define IMG_BACKGROUND_TITLEMESSAGE_3 1775 +#define IMG_BACKGROUND_TITLEMESSAGE_4 1776 +#define IMG_BACKGROUND_TITLEMESSAGE_5 1777 +#define IMG_BACKGROUND_ENVELOPE_1 1778 +#define IMG_BACKGROUND_ENVELOPE_2 1779 +#define IMG_BACKGROUND_ENVELOPE_3 1780 +#define IMG_BACKGROUND_ENVELOPE_4 1781 +#define IMG_TITLESCREEN_INITIAL_1 1782 +#define IMG_TITLESCREEN_INITIAL_2 1783 +#define IMG_TITLESCREEN_INITIAL_3 1784 +#define IMG_TITLESCREEN_INITIAL_4 1785 +#define IMG_TITLESCREEN_INITIAL_5 1786 +#define IMG_TITLESCREEN_1 1787 +#define IMG_TITLESCREEN_2 1788 +#define IMG_TITLESCREEN_3 1789 +#define IMG_TITLESCREEN_4 1790 +#define IMG_TITLESCREEN_5 1791 -#define NUM_IMAGE_FILES 1791 +#define NUM_IMAGE_FILES 1792 #endif /* CONF_GFX_H */ diff --git a/src/conftime.h b/src/conftime.h index b81fab18..965c6684 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "2007-04-28 17:12" +#define COMPILE_DATE_STRING "2007-05-08 01:19" diff --git a/src/screens.c b/src/screens.c index bbd7eb82..2a7db9c9 100644 --- a/src/screens.c +++ b/src/screens.c @@ -2238,7 +2238,11 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) info_info = info_info_main; num_info_info = 0; +#if 1 + for (i = 0; info_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++) +#else for (i = 0; info_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) +#endif { if (info_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST)) initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); @@ -4986,7 +4990,11 @@ static void DrawSetupScreen_Generic() DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, title_string); num_setup_info = 0; +#if 1 + for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++) +#else for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) +#endif { void *value_ptr = setup_info[i].value; #if 1 @@ -5186,7 +5194,21 @@ void DrawSetupScreen_Input() DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Setup Input"); #if 1 +#if 1 + DrawTextSCentered(SYSIZE - 20, FONT_TITLE_2, + "Joysticks deactivated on this screen"); +#else + DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4, + "Joysticks deactivated on this screen"); +#endif +#endif + +#if 1 +#if 1 + for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++) +#else for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) +#endif { if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST)) initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); @@ -5211,9 +5233,15 @@ void DrawSetupScreen_Input() #if 0 DeactivateJoystickForCalibration(); #endif + +#if 0 #if 1 + DrawTextSCentered(SYSIZE - 20, FONT_TITLE_2, + "Joysticks deactivated on this screen"); +#else DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4, "Joysticks deactivated on this screen"); +#endif #endif /* create gadgets for setup input menu screen */