From: Holger Schemel Date: Thu, 27 Sep 2007 08:45:19 +0000 (+0200) Subject: rnd-20070927-1-src X-Git-Tag: 3.2.5^2~3 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=bca0a1d2e0c7d05f0dfb1d1c62c85715c63652ba;p=rocksndiamonds.git rnd-20070927-1-src * added "background.PLAYING" (only visible as two-pixel border in game) * added default level set for first start of special R'n'D version * changed door animations for editor always behaving like "quick doors" --- diff --git a/ChangeLog b/ChangeLog index 39600a6c..dc8abd1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-09-27 + * added "background.PLAYING" (only visible as two-pixel border in game) + * added default level set for first start of special R'n'D version + * changed door animations for editor always behaving like "quick doors" + 2007-09-26 * added new custom artwork setup option "auto-override non-CE sets" for automatic artwork override that is only used for level sets without diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 271ef2eb..fd978dae 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -4975,6 +4975,7 @@ struct ConfigInfo image_config[] = { "background.INFO[VERSION]", UNDEFINED_FILENAME }, { "background.INFO[LEVELSET]", UNDEFINED_FILENAME }, { "background.SETUP", UNDEFINED_FILENAME }, + { "background.PLAYING", UNDEFINED_FILENAME }, { "background.DOOR", UNDEFINED_FILENAME }, { "background.titlescreen_initial_1", UNDEFINED_FILENAME }, diff --git a/src/conf_gfx.h b/src/conf_gfx.h index cde81fcb..471937df 100644 --- a/src/conf_gfx.h +++ b/src/conf_gfx.h @@ -1775,42 +1775,43 @@ #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 IMG_BACKGROUND_PLAYING 1757 +#define IMG_BACKGROUND_DOOR 1758 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_1 1759 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_2 1760 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_3 1761 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_4 1762 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_5 1763 +#define IMG_BACKGROUND_TITLESCREEN_1 1764 +#define IMG_BACKGROUND_TITLESCREEN_2 1765 +#define IMG_BACKGROUND_TITLESCREEN_3 1766 +#define IMG_BACKGROUND_TITLESCREEN_4 1767 +#define IMG_BACKGROUND_TITLESCREEN_5 1768 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_1 1769 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_2 1770 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_3 1771 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_4 1772 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_5 1773 +#define IMG_BACKGROUND_TITLEMESSAGE_1 1774 +#define IMG_BACKGROUND_TITLEMESSAGE_2 1775 +#define IMG_BACKGROUND_TITLEMESSAGE_3 1776 +#define IMG_BACKGROUND_TITLEMESSAGE_4 1777 +#define IMG_BACKGROUND_TITLEMESSAGE_5 1778 +#define IMG_BACKGROUND_ENVELOPE_1 1779 +#define IMG_BACKGROUND_ENVELOPE_2 1780 +#define IMG_BACKGROUND_ENVELOPE_3 1781 +#define IMG_BACKGROUND_ENVELOPE_4 1782 +#define IMG_TITLESCREEN_INITIAL_1 1783 +#define IMG_TITLESCREEN_INITIAL_2 1784 +#define IMG_TITLESCREEN_INITIAL_3 1785 +#define IMG_TITLESCREEN_INITIAL_4 1786 +#define IMG_TITLESCREEN_INITIAL_5 1787 +#define IMG_TITLESCREEN_1 1788 +#define IMG_TITLESCREEN_2 1789 +#define IMG_TITLESCREEN_3 1790 +#define IMG_TITLESCREEN_4 1791 +#define IMG_TITLESCREEN_5 1792 -#define NUM_IMAGE_FILES 1792 +#define NUM_IMAGE_FILES 1793 #endif /* CONF_GFX_H */ diff --git a/src/conftime.h b/src/conftime.h index 351055bc..0baa722a 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "2007-09-26 23:01" +#define COMPILE_DATE_STRING "2007-09-27 09:57" diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 45509d79..df1dac7b 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -3846,6 +3846,13 @@ void LoadLevelSetup_LastSeries() /* always start with reliable default values */ leveldir_current = getFirstValidTreeInfoEntry(leveldir_first); +#if CREATE_SPECIAL_EDITION_RND_JUE + leveldir_current = getTreeInfoFromIdentifier(leveldir_first, + "jue_start"); + if (leveldir_current == NULL) + leveldir_current = getFirstValidTreeInfoEntry(leveldir_first); +#endif + if ((level_setup_hash = loadSetupFileHash(filename))) { char *last_level_series = diff --git a/src/libgame/system.h b/src/libgame/system.h index 93baffe9..4f8c2f93 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -48,8 +48,8 @@ #define FULLSCREEN_NOT_AVAILABLE FALSE #define FULLSCREEN_AVAILABLE TRUE -#define CREATE_SPECIAL_EDITION TRUE -#define CREATE_SPECIAL_EDITION_RND_JUE TRUE +#define CREATE_SPECIAL_EDITION FALSE +#define CREATE_SPECIAL_EDITION_RND_JUE FALSE /* default input keys */ #define DEFAULT_KEY_LEFT KSYM_Left diff --git a/src/tools.c b/src/tools.c index 61320d3c..3d3930df 100644 --- a/src/tools.c +++ b/src/tools.c @@ -1941,7 +1941,13 @@ void DrawLevel() { int x,y; +#if 1 + SetMainBackgroundImage(IMG_BACKGROUND_PLAYING); + SetDrawBackgroundMask(REDRAW_FIELD); +#else SetDrawBackgroundMask(REDRAW_NONE); +#endif + ClearField(); for (x = BX1; x <= BX2; x++) @@ -3198,6 +3204,11 @@ unsigned int MoveDoor(unsigned int door_state) door_state &= ~DOOR_CLOSE_ALL; } +#if 1 + if (game_status == GAME_MODE_EDITOR) + door_state |= DOOR_NO_DELAY; +#endif + if (door_state & DOOR_ACTION) { boolean handle_door_1 = (door_state & DOOR_ACTION_1);