projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into releases
[rocksndiamonds.git]
/
src
/
game_em
/
cave.c
diff --git
a/src/game_em/cave.c
b/src/game_em/cave.c
index ab8e5c346fa76cba403bac73d3f45c7dd877f164..b816aff273bfd61e2481284047ffb653f3181853 100644
(file)
--- a/
src/game_em/cave.c
+++ b/
src/game_em/cave.c
@@
-74,7
+74,7
@@
void setLevelInfoToDefaults_EM(void)
#define MAX_EM_LEVEL_SIZE 16384
#define MAX_EM_LEVEL_SIZE 16384
-boolean LoadNativeLevel_EM(char *filename)
+boolean LoadNativeLevel_EM(char *filename
, boolean level_info_only
)
{
unsigned char raw_leveldata[MAX_EM_LEVEL_SIZE];
int raw_leveldata_length;
{
unsigned char raw_leveldata[MAX_EM_LEVEL_SIZE];
int raw_leveldata_length;
@@
-86,7
+86,8
@@
boolean LoadNativeLevel_EM(char *filename)
if (!(file = fopen(filename, MODE_READ)))
{
if (!(file = fopen(filename, MODE_READ)))
{
- Error(ERR_WARN, "cannot open level '%s' -- using empty level", filename);
+ if (!level_info_only)
+ Error(ERR_WARN, "cannot open level '%s' -- using empty level", filename);
return FALSE;
}
return FALSE;
}
@@
-102,7
+103,9
@@
boolean LoadNativeLevel_EM(char *filename)
return FALSE;
}
return FALSE;
}
- if (!(file_version = cleanup_em_level(raw_leveldata, raw_leveldata_length)))
+ file_version = cleanup_em_level(raw_leveldata, raw_leveldata_length,filename);
+
+ if (file_version == FILE_VERSION_EM_UNKNOWN)
{
Error(ERR_WARN, "unknown EM level '%s' -- using empty level", filename);
{
Error(ERR_WARN, "unknown EM level '%s' -- using empty level", filename);