projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added using masked drawing for player on walkable tiles in BD engine
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index c620a531b37bf4e30517c01366137a61e78edf8e..e15996394b425f80a04db6a99e767ecbe97c4c8f 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-274,7
+274,7
@@
static struct LevelFileConfigInfo chunk_config_INFO[] =
{
-1, -1,
TYPE_INTEGER, CONF_VALUE_16_BIT(6),
{
-1, -1,
TYPE_INTEGER, CONF_VALUE_16_BIT(6),
- &li.bd_cycle_delay_ms,
20
0
+ &li.bd_cycle_delay_ms,
16
0
},
{
-1, -1,
},
{
-1, -1,
@@
-4644,9
+4644,12
@@
static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level)
SetDefaultLevelColors_BD();
// level name
SetDefaultLevelColors_BD();
// level name
- char *cave_name = getStringPrint("%s / %d", cave->name, bd_level_nr + 1);
+ char *cave_name_latin1 = getLatin1FromUTF8(cave->name);
+ char *cave_name_final = (gd_caveset_has_levels() ?
+ getStringPrint("%s / %d", cave_name_latin1, bd_level_nr + 1) :
+ getStringCopy(cave_name_latin1));
- strncpy(level->name, cave_name, MAX_LEVEL_NAME_LEN);
+ strncpy(level->name, cave_name
_final
, MAX_LEVEL_NAME_LEN);
level->name[MAX_LEVEL_NAME_LEN] = '\0';
// playfield elements
level->name[MAX_LEVEL_NAME_LEN] = '\0';
// playfield elements
@@
-4654,7
+4657,8
@@
static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level)
for (y = 0; y < level->fieldy; y++)
level->field[x][y] = CAVE_TO_LEVEL(cave->map[y][x]);
for (y = 0; y < level->fieldy; y++)
level->field[x][y] = CAVE_TO_LEVEL(cave->map[y][x]);
- checked_free(cave_name);
+ checked_free(cave_name_latin1);
+ checked_free(cave_name_final);
}
static void setTapeInfoToDefaults(void);
}
static void setTapeInfoToDefaults(void);
@@
-10842,7
+10846,7
@@
static struct TokenInfo global_setup_tokens[] =
},
{
TYPE_SWITCH_3_STATES,
},
{
TYPE_SWITCH_3_STATES,
- &setup.bd_
skip_falling_sounds, "bd_skip
_falling_sounds"
+ &setup.bd_
falling_sounds, "bd
_falling_sounds"
},
{
TYPE_INTEGER,
},
{
TYPE_INTEGER,
@@
-11060,6
+11064,10
@@
static struct TokenInfo editor_setup_tokens[] =
TYPE_SWITCH,
&setup.editor.show_element_token, "editor.show_element_token"
},
TYPE_SWITCH,
&setup.editor.show_element_token, "editor.show_element_token"
},
+ {
+ TYPE_SWITCH,
+ &setup.editor.fast_game_start, "editor.fast_game_start"
+ },
{
TYPE_SWITCH,
&setup.editor.show_read_only_warning, "editor.show_read_only_warning"
{
TYPE_SWITCH,
&setup.editor.show_read_only_warning, "editor.show_read_only_warning"
@@
-11709,7
+11717,7
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->bd_smooth_movements = STATE_TRUE;
si->bd_pushing_graphics = STATE_TRUE;
si->bd_up_down_graphics = STATE_TRUE;
si->bd_smooth_movements = STATE_TRUE;
si->bd_pushing_graphics = STATE_TRUE;
si->bd_up_down_graphics = STATE_TRUE;
- si->bd_
skip_falling_sounds = STATE_TRUE
;
+ si->bd_
falling_sounds = STATE_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_palette_c64 = GD_DEFAULT_PALETTE_C64;
si->bd_palette_c64dtv = GD_DEFAULT_PALETTE_C64DTV;
si->bd_palette_atari = GD_DEFAULT_PALETTE_ATARI;
@@
-11822,6
+11830,7
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->editor.el_headlines = TRUE;
si->editor.show_element_token = FALSE;
si->editor.el_headlines = TRUE;
si->editor.show_element_token = FALSE;
+ si->editor.fast_game_start = FALSE;
si->editor.show_read_only_warning = TRUE;
si->editor.show_read_only_warning = TRUE;