projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added support for opening level set zip files in Android version
[rocksndiamonds.git]
/
src
/
game_em
/
cave.c
diff --git
a/src/game_em/cave.c
b/src/game_em/cave.c
index c620133cf35c6de0146460f1106e86256aa8d4ef..25d7785a0496ed761e14a989d031390cfac488e8 100644
(file)
--- a/
src/game_em/cave.c
+++ b/
src/game_em/cave.c
@@
-64,6
+64,7
@@
void setLevelInfoToDefaults_EM(void)
cav.testmode = FALSE;
cav.teamwork = FALSE;
cav.infinite = TRUE;
cav.testmode = FALSE;
cav.teamwork = FALSE;
cav.infinite = TRUE;
+ cav.infinite_true = FALSE; // default: use original EMC behaviour
cav.ball_random = FALSE;
cav.ball_active = FALSE;
cav.ball_random = FALSE;
cav.ball_active = FALSE;
@@
-109,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;
}
@@
-120,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;
}