projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added separate initial and runtime level structure definitions for EM engine
[rocksndiamonds.git]
/
src
/
game_em
/
main_em.h
diff --git
a/src/game_em/main_em.h
b/src/game_em/main_em.h
index 171b8668aa94d829cda554697a3ea5605db09113..0e988595552363b5fda805b893d31d2df7716ece 100644
(file)
--- a/
src/game_em/main_em.h
+++ b/
src/game_em/main_em.h
@@
-37,11
+37,6
@@
#define FILE_VERSION_EM_ACTUAL FILE_VERSION_EM_V6
#define FILE_VERSION_EM_ACTUAL FILE_VERSION_EM_V6
-/* level sizes and positions for EM engine */
-
-#define WIDTH EM_MAX_CAVE_WIDTH
-#define HEIGHT EM_MAX_CAVE_HEIGHT
-
/* screen sizes and positions for EM engine */
#define TILESIZE 32
/* screen sizes and positions for EM engine */
#define TILESIZE 32
@@
-92,7
+87,8
@@
extern int SX, SY;
extern unsigned int RandomEM;
extern unsigned int RandomEM;
-extern struct LEVEL lev;
+extern struct CAVE cav;
+extern struct LOGIC lev;
extern struct PLAYER ply[MAX_PLAYERS];
extern struct LevelInfo_EM native_em_level;
extern struct PLAYER ply[MAX_PLAYERS];
extern struct LevelInfo_EM native_em_level;
@@
-102,22
+98,13
@@
extern struct GameInfo_EM game_em;
extern unsigned char tab_blank[TILE_MAX];
extern unsigned char tab_acid[TILE_MAX];
extern unsigned char tab_blank[TILE_MAX];
extern unsigned char tab_acid[TILE_MAX];
+extern unsigned char tab_fake_acid[TILE_MAX];
extern unsigned char tab_amoeba[TILE_MAX];
extern unsigned char tab_android_move[TILE_MAX];
extern unsigned short tab_explode_normal[TILE_MAX];
extern unsigned short tab_explode_dynamite[TILE_MAX];
extern unsigned char tab_amoeba[TILE_MAX];
extern unsigned char tab_android_move[TILE_MAX];
extern unsigned short tab_explode_normal[TILE_MAX];
extern unsigned short tab_explode_dynamite[TILE_MAX];
-extern unsigned short map_obj[8][TILE_MAX];
-extern unsigned short map_ply[2][8][PLY_MAX];
-extern unsigned short map_ttl[128];
-
extern Bitmap *screenBitmap;
extern Bitmap *screenBitmap;
-extern Bitmap *scoreBitmap;
-
-extern Bitmap *objBitmap;
-extern Bitmap *sprBitmap;
-extern Bitmap *ttlBitmap;
-extern Bitmap *botBitmap;
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------