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 for fast game start from level editor
[rocksndiamonds.git]
/
src
/
game_em
/
cave.c
diff --git
a/src/game_em/cave.c
b/src/game_em/cave.c
index 821602ed328b8428e3be90848da547e7c215e8f3..25d7785a0496ed761e14a989d031390cfac488e8 100644
(file)
--- a/
src/game_em/cave.c
+++ b/
src/game_em/cave.c
@@
-29,16
+29,16
@@
void setLevelInfoToDefaults_EM(void)
}
cav.time_seconds = 0;
}
cav.time_seconds = 0;
- cav.
required
= 0;
+ cav.
gems_needed
= 0;
cav.eater_score = 0;
cav.alien_score = 0;
cav.bug_score = 0;
cav.tank_score = 0;
cav.eater_score = 0;
cav.alien_score = 0;
cav.bug_score = 0;
cav.tank_score = 0;
+ cav.slurp_score = 0;
+ cav.nut_score = 0;
cav.emerald_score = 0;
cav.diamond_score = 0;
cav.emerald_score = 0;
cav.diamond_score = 0;
- cav.nut_score = 0;
- cav.slurp_score = 0;
cav.dynamite_score = 0;
cav.key_score = 0;
cav.lenses_score = 0;
cav.dynamite_score = 0;
cav.key_score = 0;
cav.lenses_score = 0;
@@
-51,37
+51,42
@@
void setLevelInfoToDefaults_EM(void)
cav.amoeba_time = 0;
cav.wonderwall_time = 0;
cav.wheel_time = 0;
cav.amoeba_time = 0;
cav.wonderwall_time = 0;
cav.wheel_time = 0;
- cav.wheel_x =
1
;
- cav.wheel_y =
1
;
+ cav.wheel_x =
0
;
+ cav.wheel_y =
0
;
cav.lenses_time = 0;
cav.magnify_time = 0;
cav.lenses_time = 0;
cav.magnify_time = 0;
- cav.wind_time =
9999
;
+ cav.wind_time =
0
;
cav.wind_direction = 0;
cav.wind_direction = 0;
- cav.
ball_random = 0
;
- cav.
ball_state = 0
;
- cav.wonderwall_state = 0;
- cav.
wheel_cnt = 0
;
- cav.
lenses_cnt = 0
;
- cav.
magnify_cnt = 0
;
- cav.
wind_cnt = 0;
+ cav.
num_eater_arrays = 8
;
+ cav.
num_ball_arrays = 8
;
+
+ cav.
testmode = FALSE
;
+ cav.
teamwork = FALSE
;
+ cav.
infinite = TRUE
;
+ cav.
infinite_true = FALSE; // default: use original EMC behaviour
- cav.num_ball_arrays = 8;
+ cav.ball_random = FALSE;
+ cav.ball_active = FALSE;
+ cav.wonderwall_active = FALSE;
+ cav.wheel_active = FALSE;
+ cav.lenses_active = FALSE;
+ cav.magnify_active = FALSE;
for (i = 0; i < 8; i++)
for (j = 0; j < 9; j++)
for (i = 0; i < 8; i++)
for (j = 0; j < 9; j++)
- cav.eater_array[i][j] =
X
blank;
+ cav.eater_array[i][j] =
C
blank;
for (i = 0; i < 8; i++)
for (j = 0; j < 8; j++)
for (i = 0; i < 8; i++)
for (j = 0; j < 8; j++)
- cav.ball_array[i][j] =
X
blank;
+ cav.ball_array[i][j] =
C
blank;
- for (i = 0; i < TILE_MAX; i++)
- cav.android_array[i] =
X
blank;
+ for (i = 0; i <
GAME_
TILE_MAX; i++)
+ cav.android_array[i] =
C
blank;
for (x = 0; x < CAVE_WIDTH; x++)
for (y = 0; y < CAVE_HEIGHT; y++)
for (x = 0; x < CAVE_WIDTH; x++)
for (y = 0; y < CAVE_HEIGHT; y++)
- cav.cave[x][y] =
Zborder
;
+ cav.cave[x][y] =
Cblank
;
}
}
@@
-105,7
+110,7
@@
boolean LoadNativeLevel_EM(char *filename, boolean level_info_only)
if (!(file = openFile(filename, MODE_READ)))
{
if (!level_info_only)
if (!(file = openFile(filename, MODE_READ)))
{
if (!level_info_only)
-
Error(ERR_WARN,
"cannot open level '%s' -- using empty level", filename);
+
Warn(
"cannot open level '%s' -- using empty level", filename);
return FALSE;
}
return FALSE;
}
@@
-116,16
+121,16
@@
boolean LoadNativeLevel_EM(char *filename, boolean level_info_only)
if (raw_leveldata_length <= 0)
{
if (raw_leveldata_length <= 0)
{
-
Error(ERR_WARN,
"cannot read level '%s' -- using empty level", filename);
+
Warn(
"cannot read level '%s' -- using empty level", filename);
return FALSE;
}
return FALSE;
}
- file_version = cleanup_em_level(raw_leveldata, raw_leveldata_length,filename);
+ file_version = cleanup_em_level(raw_leveldata, raw_leveldata_length,
filename);
if (file_version == FILE_VERSION_EM_UNKNOWN)
{
if (file_version == FILE_VERSION_EM_UNKNOWN)
{
-
Error(ERR_WARN,
"unknown EM level '%s' -- using empty level", filename);
+
Warn(
"unknown EM level '%s' -- using empty level", filename);
return FALSE;
}
return FALSE;
}