projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed order of switch cases in EM engine source file
[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 6c9653154b8631e38e716fed372d56d99c286ff8..b2730decc90ad276fbd3cd01c117e45299594875 100644
(file)
--- a/
src/game_em/main_em.h
+++ b/
src/game_em/main_em.h
@@
-1,31
+1,30
@@
#ifndef MAIN_EM_H
#define MAIN_EM_H
#ifndef MAIN_EM_H
#define MAIN_EM_H
-/
* ========================================================================= */
-/
* external functions and definitions imported from main program to game_em */
-/
* ========================================================================= */
+/
/ ============================================================================
+/
/ external functions and definitions imported from main program to game_em
+/
/ ============================================================================
#include "../engines.h"
#include "../engines.h"
-/
* ========================================================================= */
-/
* functions and definitions that are exported from game_em to main program */
-/
* ========================================================================= */
+/
/ ============================================================================
+/
/ functions and definitions that are exported from game_em to main program
+/
/ ============================================================================
#include "export.h"
#include "export.h"
-/
* ========================================================================= */
-/
* internal functions and definitions that are not exported to main program */
-/
* ========================================================================= */
+/
/ ============================================================================
+/
/ internal functions and definitions that are not exported to main program
+/
/ ============================================================================
#include "global.h"
#include "global.h"
-#include "sample.h"
-/
* ------------------------------------------------------------------------- */
-/
* constant definitions */
-/
* ------------------------------------------------------------------------- */
+/
/ ----------------------------------------------------------------------------
+/
/ constant definitions
+/
/ ----------------------------------------------------------------------------
/* values for native Emerald Mine game version */
#define FILE_VERSION_EM_UNKNOWN 0
/* values for native Emerald Mine game version */
#define FILE_VERSION_EM_UNKNOWN 0
@@
-38,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
@@
-68,9
+62,9
@@
extern int SX, SY;
#define PLAY_ELEMENT_SOUND FALSE
#define PLAY_ELEMENT_SOUND FALSE
-/
* ------------------------------------------------------------------------- */
-/
* macro function definitions */
-/
* ------------------------------------------------------------------------- */
+/
/ ----------------------------------------------------------------------------
+/
/ macro function definitions
+/
/ ----------------------------------------------------------------------------
#define ROUNDED_DIVIDE(x, y) (((x) + (y) - 1) / (y))
#define ROUNDED_DIVIDE(x, y) (((x) + (y) - 1) / (y))
@@
-83,13
+77,13
@@
extern int SX, SY;
#define DISPLAY_TIME(x) ROUNDED_DIVIDE(x, FRAMES_PER_SECOND)
#define DISPLAY_TIME(x) ROUNDED_DIVIDE(x, FRAMES_PER_SECOND)
-/
* ------------------------------------------------------------------------- */
-/
* data structure definitions */
-/
* ------------------------------------------------------------------------- */
+/
/ ----------------------------------------------------------------------------
+/
/ data structure definitions
+/
/ ----------------------------------------------------------------------------
-/
* ------------------------------------------------------------------------- */
-/
* exported variables */
-/
* ------------------------------------------------------------------------- */
+/
/ ----------------------------------------------------------------------------
+/
/ exported variables
+/
/ ----------------------------------------------------------------------------
extern unsigned int RandomEM;
extern unsigned int RandomEM;
@@
-98,37
+92,22
@@
extern struct PLAYER ply[MAX_PLAYERS];
extern struct LevelInfo_EM native_em_level;
extern struct GraphicInfo_EM graphic_info_em_object[TILE_MAX][8];
extern struct LevelInfo_EM native_em_level;
extern struct GraphicInfo_EM graphic_info_em_object[TILE_MAX][8];
-extern struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][SPR_MAX][8];
-
-extern short **Boom;
-extern short **Cave;
-extern short **Next;
-extern short **Draw;
-
+extern struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][PLY_MAX][8];
extern struct GameInfo_EM game_em;
extern unsigned char tab_blank[TILE_MAX];
extern unsigned char tab_acid[TILE_MAX];
extern struct GameInfo_EM game_em;
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_spr[2][8][SPR_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;
-/
* ------------------------------------------------------------------------- */
-/
* exported functions */
-/
* ------------------------------------------------------------------------- */
+/
/ ----------------------------------------------------------------------------
+/
/ exported functions
+/
/ ----------------------------------------------------------------------------
-#endif /
* MAIN_EM_H */
+#endif /
/ MAIN_EM_H