projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed some fields in 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 a811d03ee3d8baf23f3ce4a5867f9f5afd47c1bb..43732aa1ccd6b6cf2981a3680990c234919609e7 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,42
+13,38
@@
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 = &cav;
-
native_em_level
.lev = &lev;
- native_em_level.ply1 = &ply1;
-
native_em_level.ply2 = &ply2
;
+
game_em
.lev = &lev;
+ for (i = 0; i < MAX_PLAYERS; i++)
+
game_em.ply[i] = &ply[i]
;
-
le
v.width = 64;
-
le
v.height = 32;
+
ca
v.width = 64;
+
ca
v.height = 32;
- ply1.x_initial = 0;
- ply1.y_initial = 0;
-
-
ply2.x_initial = 0
;
- ply2.y_initial = 0;
+ for (i = 0; i < MAX_PLAYERS; i++)
+ {
+ cav.player_x[i] = -1;
+
cav.player_y[i] = -1
;
+ }
-
lev.lenses_cnt_initial
= 0;
-
lev.magnify_cnt_initial
= 0;
+
cav.lenses_cnt
= 0;
+
cav.magnify_cnt
= 0;
-
lev.wheel_cnt_initial
= 0;
-
lev.wheel_x_initial
= 1;
-
lev.wheel_y_initial
= 1;
+
cav.wheel_cnt
= 0;
+
cav.wheel_x
= 1;
+
cav.wheel_y
= 1;
-
le
v.wind_time = 9999;
-
lev.wind_cnt_initial
= 0;
+
ca
v.wind_time = 9999;
+
cav.wind_cnt
= 0;
-
lev.wonderwall_state_initial
= 0;
-
lev.wonderwall_time_initial
= 0;
+
cav.wonderwall_state
= 0;
+
cav.wonderwall_time
= 0;
-
le
v.num_ball_arrays = 8;
+
ca
v.num_ball_arrays = 8;
for (i = 0; i < TILE_MAX; i++)
for (i = 0; i < TILE_MAX; i++)
- lev.android_array[i] = Xblank;
-
- lev.home_initial = 1; /* initial number of players in this level */
-
- ply1.alive_initial = (lev.home_initial >= 1);
- ply2.alive_initial = (lev.home_initial >= 2);
+ cav.android_array[i] = Xblank;
}
}
@@
-61,26
+55,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)
{
@@
-89,7
+84,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);