projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved initial cave data to level structure for EM engine
[rocksndiamonds.git]
/
src
/
game_em
/
cave.c
diff --git
a/src/game_em/cave.c
b/src/game_em/cave.c
index 47f7315eaeab5358bce2c7c8651748e91e2627ec..b4dd58231cf1880534349667289b56900d84818f 100644
(file)
--- a/
src/game_em/cave.c
+++ b/
src/game_em/cave.c
@@
-3,9
+3,7
@@
* cave data structures
*/
* cave data structures
*/
-#include "global.h"
-#include "tile.h"
-#include "level.h"
+#include "main_em.h"
struct LevelInfo_EM native_em_level;
struct LevelInfo_EM native_em_level;
@@
-15,18
+13,19
@@
void setLevelInfoToDefaults_EM(void)
int i;
native_em_level.file_version = FILE_VERSION_EM_ACTUAL;
int i;
native_em_level.file_version = FILE_VERSION_EM_ACTUAL;
+ native_em_level.cav = &lev;
-
native_em_level
.lev = &lev;
+
game_em
.lev = &lev;
for (i = 0; i < MAX_PLAYERS; i++)
for (i = 0; i < MAX_PLAYERS; i++)
-
native_em_level
.ply[i] = &ply[i];
+
game_em
.ply[i] = &ply[i];
lev.width = 64;
lev.height = 32;
for (i = 0; i < MAX_PLAYERS; i++)
{
lev.width = 64;
lev.height = 32;
for (i = 0; i < MAX_PLAYERS; i++)
{
-
ply[i].x_initial = 0
;
-
ply[i].y_initial = 0
;
+
lev.player_x[i] = -1
;
+
lev.player_y[i] = -1
;
}
lev.lenses_cnt_initial = 0;
}
lev.lenses_cnt_initial = 0;
@@
-47,7
+46,6
@@
void setLevelInfoToDefaults_EM(void)
for (i = 0; i < TILE_MAX; i++)
lev.android_array[i] = Xblank;
for (i = 0; i < TILE_MAX; i++)
lev.android_array[i] = Xblank;
-#if 1
/* initial number of players in this level */
lev.home_initial = 0;
/* initial number of players in this level */
lev.home_initial = 0;
@@
-56,16
+54,6
@@
void setLevelInfoToDefaults_EM(void)
ply[i].exists = 0;
ply[i].alive_initial = FALSE;
}
ply[i].exists = 0;
ply[i].alive_initial = FALSE;
}
-#else
- /* initial number of players in this level */
- lev.home_initial = (setup.team_mode ? 2 : 1);
-
- for (i = 0; i < MAX_PLAYERS; i++)
- {
- ply[i].exists = 0;
- ply[i].alive_initial = (lev.home_initial > i ? TRUE : FALSE);
- }
-#endif
}
}
@@
-76,26
+64,27
@@
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;
int file_version;
{
unsigned char raw_leveldata[MAX_EM_LEVEL_SIZE];
int raw_leveldata_length;
int file_version;
- F
ILE
*file;
+ F
ile
*file;
/* always start with reliable default values */
setLevelInfoToDefaults_EM();
/* always start with reliable default values */
setLevelInfoToDefaults_EM();
- if (!(file =
fopen
(filename, MODE_READ)))
+ if (!(file =
openFile
(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;
}
- raw_leveldata_length =
fread(raw_leveldata, 1, MAX_EM_LEVEL_SIZE, file
);
+ raw_leveldata_length =
readFile(file, raw_leveldata, 1, MAX_EM_LEVEL_SIZE
);
-
fclos
e(file);
+
closeFil
e(file);
if (raw_leveldata_length <= 0)
{
if (raw_leveldata_length <= 0)
{
@@
-104,7
+93,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);