projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed variable for counting number of tape players
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index bc076598094227a1dfece0a6d33d359ff7a2b188..2f249ada3eba63aeb204a04cd1def50325c8295f 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-768,9
+768,15
@@
static struct LevelFileConfigInfo chunk_config_ELEM[] =
&li.android_clone_time, 10
},
{
&li.android_clone_time, 10
},
{
- EL_EMC_ANDROID,
-1
,
+ EL_EMC_ANDROID,
SAVE_CONF_NEVER
,
TYPE_ELEMENT_LIST, CONF_VALUE_BYTES(1),
&li.android_clone_element[0], EL_EMPTY, NULL,
TYPE_ELEMENT_LIST, CONF_VALUE_BYTES(1),
&li.android_clone_element[0], EL_EMPTY, NULL,
+ &li.num_android_clone_elements, 1, MAX_ANDROID_ELEMENTS_OLD
+ },
+ {
+ EL_EMC_ANDROID, -1,
+ TYPE_ELEMENT_LIST, CONF_VALUE_BYTES(2),
+ &li.android_clone_element[0], EL_EMPTY, NULL,
&li.num_android_clone_elements, 1, MAX_ANDROID_ELEMENTS
},
&li.num_android_clone_elements, 1, MAX_ANDROID_ELEMENTS
},
@@
-809,7
+815,7
@@
static struct LevelFileConfigInfo chunk_config_ELEM[] =
{
EL_EMC_MAGIC_BALL, -1,
TYPE_BOOLEAN, CONF_VALUE_8_BIT(2),
{
EL_EMC_MAGIC_BALL, -1,
TYPE_BOOLEAN, CONF_VALUE_8_BIT(2),
- &li.ball_
state_initial,
FALSE
+ &li.ball_
active_initial,
FALSE
},
{
EL_EMC_MAGIC_BALL, -1,
},
{
EL_EMC_MAGIC_BALL, -1,
@@
-3548,7
+3554,7
@@
static void CopyNativeLevel_RND_to_EM(struct LevelInfo *level)
cav->android_move_time = level->android_move_time;
cav->android_clone_time = level->android_clone_time;
cav->ball_random = level->ball_random;
cav->android_move_time = level->android_move_time;
cav->android_clone_time = level->android_clone_time;
cav->ball_random = level->ball_random;
- cav->ball_
state = level->ball_stat
e_initial;
+ cav->ball_
active = level->ball_activ
e_initial;
cav->ball_time = level->ball_time;
cav->num_ball_arrays = level->num_ball_contents;
cav->ball_time = level->ball_time;
cav->num_ball_arrays = level->num_ball_contents;
@@
-3561,8
+3567,6
@@
static void CopyNativeLevel_RND_to_EM(struct LevelInfo *level)
cav->wind_direction =
map_direction_RND_to_EM(level->wind_direction_initial);
cav->wind_direction =
map_direction_RND_to_EM(level->wind_direction_initial);
- cav->wind_cnt = (level->wind_direction_initial != MV_NONE ?
- cav->wind_time : 0);
for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
for (j = 0; j < 8; j++)
for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
for (j = 0; j < 8; j++)
@@
-3660,7
+3664,7
@@
static void CopyNativeLevel_EM_to_RND(struct LevelInfo *level)
level->android_move_time = cav->android_move_time;
level->android_clone_time = cav->android_clone_time;
level->ball_random = cav->ball_random;
level->android_move_time = cav->android_move_time;
level->android_clone_time = cav->android_clone_time;
level->ball_random = cav->ball_random;
- level->ball_
state_initial = cav->ball_stat
e;
+ level->ball_
active_initial = cav->ball_activ
e;
level->ball_time = cav->ball_time;
level->num_ball_contents = cav->num_ball_arrays;
level->ball_time = cav->ball_time;
level->num_ball_contents = cav->num_ball_arrays;
@@
-3982,7
+3986,7
@@
static void CopyNativeTape_SP_to_RND(struct LevelInfo *level)
int demo_repeat = (demo->data[i] & 0xf0) >> 4;
int tape_action = map_key_SP_to_RND(demo_action);
int tape_repeat = demo_repeat + 1;
int demo_repeat = (demo->data[i] & 0xf0) >> 4;
int tape_action = map_key_SP_to_RND(demo_action);
int tape_repeat = demo_repeat + 1;
- byte action[MAX_
PLAYERS] = { tape_action, 0, 0, 0
};
+ byte action[MAX_
TAPE_ACTIONS] = { tape_action
};
boolean success = 0;
int j;
boolean success = 0;
int j;
@@
-8101,7
+8105,6
@@
void SaveTape(int nr)
{
char *filename = getTapeFilename(nr);
FILE *file;
{
char *filename = getTapeFilename(nr);
FILE *file;
- int num_participating_players = 0;
int tape_pos_size;
int info_chunk_size;
int body_chunk_size;
int tape_pos_size;
int info_chunk_size;
int body_chunk_size;
@@
-8118,12
+8121,14
@@
void SaveTape(int nr)
tape.file_version = FILE_VERSION_ACTUAL;
tape.game_version = GAME_VERSION_ACTUAL;
tape.file_version = FILE_VERSION_ACTUAL;
tape.game_version = GAME_VERSION_ACTUAL;
+ tape.num_participating_players = 0;
+
// count number of participating players
for (i = 0; i < MAX_PLAYERS; i++)
if (tape.player_participates[i])
// count number of participating players
for (i = 0; i < MAX_PLAYERS; i++)
if (tape.player_participates[i])
- num_participating_players++;
+
tape.
num_participating_players++;
- tape_pos_size = (tape.use_mouse ? 3 : num_participating_players) + 1;
+ tape_pos_size = (tape.use_mouse ? 3 :
tape.
num_participating_players) + 1;
info_chunk_size = 2 + (strlen(tape.level_identifier) + 1) + 2;
body_chunk_size = tape_pos_size * tape.length;
info_chunk_size = 2 + (strlen(tape.level_identifier) + 1) + 2;
body_chunk_size = tape_pos_size * tape.length;
@@
-8361,6
+8366,10
@@
static struct TokenInfo global_setup_tokens[] =
TYPE_SWITCH,
&setup.scroll_delay, "scroll_delay"
},
TYPE_SWITCH,
&setup.scroll_delay, "scroll_delay"
},
+ {
+ TYPE_SWITCH,
+ &setup.forced_scroll_delay, "forced_scroll_delay"
+ },
{
TYPE_INTEGER,
&setup.scroll_delay_value, "scroll_delay_value"
{
TYPE_INTEGER,
&setup.scroll_delay_value, "scroll_delay_value"
@@
-9106,6
+9115,7
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->sound_simple = TRUE;
si->toons = TRUE;
si->scroll_delay = TRUE;
si->sound_simple = TRUE;
si->toons = TRUE;
si->scroll_delay = TRUE;
+ si->forced_scroll_delay = FALSE;
si->scroll_delay_value = STD_SCROLL_DELAY;
si->engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_DEFAULT);
si->engine_snapshot_memory = SNAPSHOT_MEMORY_DEFAULT;
si->scroll_delay_value = STD_SCROLL_DELAY;
si->engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_DEFAULT);
si->engine_snapshot_memory = SNAPSHOT_MEMORY_DEFAULT;
@@
-10300,6
+10310,9
@@
int get_parameter_value(char *value_raw, char *suffix, int type)
if (string_has_parameter(value, "reverse"))
result |= STYLE_REVERSE;
if (string_has_parameter(value, "reverse"))
result |= STYLE_REVERSE;
+ if (string_has_parameter(value, "block_clicks"))
+ result |= STYLE_BLOCK;
+
if (string_has_parameter(value, "passthrough_clicks"))
result |= STYLE_PASSTHROUGH;
if (string_has_parameter(value, "passthrough_clicks"))
result |= STYLE_PASSTHROUGH;