projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed and removed some variables
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index e94692c5edd653cda057191333b59bb3060d709f..d4751ae52b8a4cfb6622a499e9f4f5d3e302be84 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
},
@@
-3539,7
+3545,7
@@
static void CopyNativeLevel_RND_to_EM(struct LevelInfo *level)
for (y = 0; y < 3; y++)
for (x = 0; x < 3; x++)
cav->eater_array[i][y * 3 + x] =
for (y = 0; y < 3; y++)
for (x = 0; x < 3; x++)
cav->eater_array[i][y * 3 + x] =
- map_element_RND_to_EM(level->yamyam_content[i].e[x][y]);
+ map_element_RND_to_EM
_cave
(level->yamyam_content[i].e[x][y]);
cav->amoeba_time = level->amoeba_speed;
cav->wonderwall_time = level->time_magic_wall;
cav->amoeba_time = level->amoeba_speed;
cav->wonderwall_time = level->time_magic_wall;
@@
-3567,23
+3573,23
@@
static void CopyNativeLevel_RND_to_EM(struct LevelInfo *level)
for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
for (j = 0; j < 8; j++)
cav->ball_array[i][j] =
for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
for (j = 0; j < 8; j++)
cav->ball_array[i][j] =
- map_element_RND_to_EM
(level->
-
ball_content[i].
e[ball_xy[j][0]][ball_xy[j][1]]);
+ map_element_RND_to_EM
_cave(level->ball_content[i].
+
e[ball_xy[j][0]][ball_xy[j][1]]);
map_android_clone_elements_RND_to_EM(level);
map_android_clone_elements_RND_to_EM(level);
- // first fill the complete playfield with the
default border
element
+ // first fill the complete playfield with the
empty space
element
for (y = 0; y < EM_MAX_CAVE_HEIGHT; y++)
for (x = 0; x < EM_MAX_CAVE_WIDTH; x++)
for (y = 0; y < EM_MAX_CAVE_HEIGHT; y++)
for (x = 0; x < EM_MAX_CAVE_WIDTH; x++)
- cav->cave[x][y] =
Zborder
;
+ cav->cave[x][y] =
Cblank
;
// then copy the real level contents from level file into the playfield
for (y = 0; y < cav->height; y++) for (x = 0; x < cav->width; x++)
{
// then copy the real level contents from level file into the playfield
for (y = 0; y < cav->height; y++) for (x = 0; x < cav->width; x++)
{
- int new_element = map_element_RND_to_EM(level->field[x][y]);
+ int new_element = map_element_RND_to_EM
_cave
(level->field[x][y]);
if (level->field[x][y] == EL_AMOEBA_DEAD)
if (level->field[x][y] == EL_AMOEBA_DEAD)
- new_element = map_element_RND_to_EM(EL_AMOEBA_WET);
+ new_element = map_element_RND_to_EM
_cave
(EL_AMOEBA_WET);
cav->cave[x][y] = new_element;
}
cav->cave[x][y] = new_element;
}
@@
-3604,7
+3610,7
@@
static void CopyNativeLevel_RND_to_EM(struct LevelInfo *level)
cav->player_x[player_nr] = x;
cav->player_y[player_nr] = y;
cav->player_x[player_nr] = x;
cav->player_y[player_nr] = y;
- cav->cave[x][y] = map_element_RND_to_EM(EL_EMPTY);
+ cav->cave[x][y] = map_element_RND_to_EM
_cave
(EL_EMPTY);
}
}
}
}
}
}
@@
-3651,7
+3657,7
@@
static void CopyNativeLevel_EM_to_RND(struct LevelInfo *level)
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] =
- map_element_EM_to_RND(cav->eater_array[i][y * 3 + x]);
+ map_element_EM_to_RND
_cave
(cav->eater_array[i][y * 3 + x]);
level->amoeba_speed = cav->amoeba_time;
level->time_magic_wall = cav->wonderwall_time;
level->amoeba_speed = cav->amoeba_time;
level->time_magic_wall = cav->wonderwall_time;
@@
-3677,14
+3683,14
@@
static void CopyNativeLevel_EM_to_RND(struct LevelInfo *level)
for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
for (j = 0; j < 8; j++)
level->ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]] =
for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
for (j = 0; j < 8; j++)
level->ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]] =
- map_element_EM_to_RND(cav->ball_array[i][j]);
+ map_element_EM_to_RND
_cave
(cav->ball_array[i][j]);
map_android_clone_elements_EM_to_RND(level);
// convert the playfield (some elements need special treatment)
for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
{
map_android_clone_elements_EM_to_RND(level);
// convert the playfield (some elements need special treatment)
for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
{
- int new_element = map_element_EM_to_RND(cav->cave[x][y]);
+ int new_element = map_element_EM_to_RND
_cave
(cav->cave[x][y]);
if (new_element == EL_AMOEBA_WET && level->amoeba_speed == 0)
new_element = EL_AMOEBA_DEAD;
if (new_element == EL_AMOEBA_WET && level->amoeba_speed == 0)
new_element = EL_AMOEBA_DEAD;
@@
-8361,6
+8367,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
+9116,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;