projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added setup option to show invisible exit in BD engine
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 38f142585ac07cf49157ae22cd4050149e1e5796..ce6928b7c43514c9bdb8a191107703652a630a6b 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-2334,6
+2334,11
@@
void setElementChangeInfoToDefaults(struct ElementChangeInfo *change)
static void setLevelInfoToDefaults_Level(struct LevelInfo *level)
{
static void setLevelInfoToDefaults_Level(struct LevelInfo *level)
{
+ boolean add_border = FALSE;
+ int x1 = 0;
+ int y1 = 0;
+ int x2 = STD_LEV_FIELDX - 1;
+ int y2 = STD_LEV_FIELDY - 1;
int i, x, y;
li = *level; // copy level data into temporary buffer
int i, x, y;
li = *level; // copy level data into temporary buffer
@@
-2372,15
+2377,35
@@
static void setLevelInfoToDefaults_Level(struct LevelInfo *level)
// set default game engine type
level->game_engine_type = setup.default_game_engine_type;
// set default game engine type
level->game_engine_type = setup.default_game_engine_type;
+ // some game engines should have a default playfield with border elements
+ if (level->game_engine_type == GAME_ENGINE_TYPE_BD ||
+ level->game_engine_type == GAME_ENGINE_TYPE_EM ||
+ level->game_engine_type == GAME_ENGINE_TYPE_SP)
+ {
+ add_border = TRUE;
+ x1++;
+ y1++;
+ x2--;
+ y2--;
+ }
+
// set level playfield to playable default level with player and exit
for (x = 0; x < MAX_LEV_FIELDX; x++)
// set level playfield to playable default level with player and exit
for (x = 0; x < MAX_LEV_FIELDX; x++)
+ {
for (y = 0; y < MAX_LEV_FIELDY; y++)
for (y = 0; y < MAX_LEV_FIELDY; y++)
- level->field[x][y] = EL_SAND;
+ {
+ if (add_border && (x == 0 || x == STD_LEV_FIELDX - 1 ||
+ y == 0 || y == STD_LEV_FIELDY - 1))
+ level->field[x][y] = getEngineElement(EL_STEELWALL);
+ else
+ level->field[x][y] = getEngineElement(EL_SAND);
+ }
+ }
- level->field[
0][0] = EL_PLAYER_1
;
- level->field[
STD_LEV_FIELDX - 1][STD_LEV_FIELDY - 1] = EL_EXIT_CLOSED
;
+ level->field[
x1][y1] = getEngineElement(EL_PLAYER_1)
;
+ level->field[
x2][y2] = getEngineElement(EL_EXIT_CLOSED)
;
- BorderElement =
EL_STEELWALL
;
+ BorderElement =
getEngineElement(EL_STEELWALL)
;
// detect custom elements when loading them
level->file_has_custom_elements = FALSE;
// detect custom elements when loading them
level->file_has_custom_elements = FALSE;
@@
-10746,10
+10771,26
@@
static struct TokenInfo global_setup_tokens[] =
TYPE_SWITCH,
&setup.bd_scroll_delay, "bd_scroll_delay"
},
TYPE_SWITCH,
&setup.bd_scroll_delay, "bd_scroll_delay"
},
+ {
+ TYPE_SWITCH,
+ &setup.bd_show_invisible_outbox, "bd_show_invisible_outbox"
+ },
{
TYPE_SWITCH3,
&setup.bd_smooth_movements, "bd_smooth_movements"
},
{
TYPE_SWITCH3,
&setup.bd_smooth_movements, "bd_smooth_movements"
},
+ {
+ TYPE_SWITCH3,
+ &setup.bd_pushing_graphics, "bd_pushing_graphics"
+ },
+ {
+ TYPE_SWITCH3,
+ &setup.bd_up_down_graphics, "bd_up_down_graphics"
+ },
+ {
+ TYPE_SWITCH3,
+ &setup.bd_skip_falling_sounds, "bd_skip_falling_sounds"
+ },
{
TYPE_INTEGER,
&setup.bd_palette_c64, "bd_palette_c64"
{
TYPE_INTEGER,
&setup.bd_palette_c64, "bd_palette_c64"
@@
-10766,6
+10807,10
@@
static struct TokenInfo global_setup_tokens[] =
TYPE_INTEGER,
&setup.bd_default_color_type, "bd_default_color_type"
},
TYPE_INTEGER,
&setup.bd_default_color_type, "bd_default_color_type"
},
+ {
+ TYPE_SWITCH,
+ &setup.bd_random_colors, "bd_random_colors"
+ },
{
TYPE_SWITCH,
&setup.sp_show_border_elements, "sp_show_border_elements"
{
TYPE_SWITCH,
&setup.sp_show_border_elements, "sp_show_border_elements"
@@
-11590,11
+11635,16
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->bd_skip_uncovering = FALSE;
si->bd_skip_hatching = FALSE;
si->bd_scroll_delay = TRUE;
si->bd_skip_uncovering = FALSE;
si->bd_skip_hatching = FALSE;
si->bd_scroll_delay = TRUE;
+ si->bd_show_invisible_outbox = FALSE;
si->bd_smooth_movements = AUTO;
si->bd_smooth_movements = AUTO;
+ si->bd_pushing_graphics = TRUE;
+ si->bd_up_down_graphics = TRUE;
+ si->bd_skip_falling_sounds = AUTO;
si->bd_palette_c64 = GD_DEFAULT_PALETTE_C64;
si->bd_palette_c64dtv = GD_DEFAULT_PALETTE_C64DTV;
si->bd_palette_atari = GD_DEFAULT_PALETTE_ATARI;
si->bd_default_color_type = GD_DEFAULT_COLOR_TYPE;
si->bd_palette_c64 = GD_DEFAULT_PALETTE_C64;
si->bd_palette_c64dtv = GD_DEFAULT_PALETTE_C64DTV;
si->bd_palette_atari = GD_DEFAULT_PALETTE_ATARI;
si->bd_default_color_type = GD_DEFAULT_COLOR_TYPE;
+ si->bd_random_colors = FALSE;
si->sp_show_border_elements = FALSE;
si->small_game_graphics = FALSE;
si->show_load_save_buttons = FALSE;
si->sp_show_border_elements = FALSE;
si->small_game_graphics = FALSE;
si->show_load_save_buttons = FALSE;