projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed "http" to "https" in URLs
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index d34f3fe30b298172ced69349277af3bff81e7845..c07043450023b9650e5102c5d9a9cb45b4e29f55 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-4,7
+4,7
@@
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// http
s
://www.artsoft.org/
// ----------------------------------------------------------------------------
// files.c
// ============================================================================
// ----------------------------------------------------------------------------
// files.c
// ============================================================================
@@
-3541,6
+3541,8
@@
static void CopyNativeLevel_RND_to_EM(struct LevelInfo *level)
cav->key_score = level->score[SC_KEY];
cav->exit_score = level->score[SC_TIME_BONUS];
cav->key_score = level->score[SC_KEY];
cav->exit_score = level->score[SC_TIME_BONUS];
+ cav->num_eater_arrays = level->num_yamyam_contents;
+
for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
for (y = 0; y < 3; y++)
for (x = 0; x < 3; x++)
for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
for (y = 0; y < 3; y++)
for (x = 0; x < 3; x++)
@@
-3649,9
+3651,9
@@
static void CopyNativeLevel_EM_to_RND(struct LevelInfo *level)
level->score[SC_KEY] = cav->key_score;
level->score[SC_TIME_BONUS] = cav->exit_score;
level->score[SC_KEY] = cav->key_score;
level->score[SC_TIME_BONUS] = cav->exit_score;
- level->num_yamyam_contents
= MAX_ELEMENT_CONTENTS
;
+ level->num_yamyam_contents
= cav->num_eater_arrays
;
- for (i = 0; i <
level->num_yamyam_contents
; i++)
+ for (i = 0; i <
MAX_ELEMENT_CONTENTS
; i++)
for (y = 0; y < 3; y++)
for (x = 0; x < 3; x++)
level->yamyam_content[i].e[x][y] =
for (y = 0; y < 3; y++)
for (x = 0; x < 3; x++)
level->yamyam_content[i].e[x][y] =
@@
-8505,6
+8507,10
@@
static struct TokenInfo global_setup_tokens[] =
TYPE_SWITCH,
&setup.prefer_aga_graphics, "prefer_aga_graphics"
},
TYPE_SWITCH,
&setup.prefer_aga_graphics, "prefer_aga_graphics"
},
+ {
+ TYPE_SWITCH,
+ &setup.prefer_lowpass_sounds, "prefer_lowpass_sounds"
+ },
{
TYPE_SWITCH,
&setup.game_speed_extended, "game_speed_extended"
{
TYPE_SWITCH,
&setup.game_speed_extended, "game_speed_extended"
@@
-9176,6
+9182,7
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->quick_switch = FALSE;
si->input_on_focus = FALSE;
si->prefer_aga_graphics = TRUE;
si->quick_switch = FALSE;
si->input_on_focus = FALSE;
si->prefer_aga_graphics = TRUE;
+ si->prefer_lowpass_sounds = FALSE;
si->game_speed_extended = FALSE;
si->game_frame_delay = GAME_FRAME_DELAY;
si->sp_show_border_elements = FALSE;
si->game_speed_extended = FALSE;
si->game_frame_delay = GAME_FRAME_DELAY;
si->sp_show_border_elements = FALSE;