projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added "index.html" file for Emscripten support
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index c412801a2607b2e667710e9a6f7fc06ac2ecc9de..9865fb1c3ab020ed85717c5bdd27c3c705b6d461 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-808,6
+808,9
@@
#define IS_DC_STEELWALL_2(e) ((e) >= EL_DC_STEELWALL_2_LEFT && \
(e) <= EL_DC_STEELWALL_2_SINGLE)
#define IS_DC_STEELWALL_2(e) ((e) >= EL_DC_STEELWALL_2_LEFT && \
(e) <= EL_DC_STEELWALL_2_SINGLE)
+// !!! IMPROVE THIS !!!
+#define IS_EM_ELEMENT(e) (map_element_EM_to_RND_cave(map_element_RND_to_EM_cave(e)) == (e))
+
#define MM_WALL_BASE(e) ((e) & 0xfff0)
#define MM_WALL_BITS(e) ((e) & 0x000f)
#define MM_WALL_BASE(e) ((e) & 0xfff0)
#define MM_WALL_BITS(e) ((e) & 0x000f)
@@
-2562,7
+2565,7
@@
enum
#define PROGRAM_VERSION_SUPER 4
#define PROGRAM_VERSION_MAJOR 2
#define PROGRAM_VERSION_MINOR 0
#define PROGRAM_VERSION_SUPER 4
#define PROGRAM_VERSION_MAJOR 2
#define PROGRAM_VERSION_MINOR 0
-#define PROGRAM_VERSION_PATCH
3
+#define PROGRAM_VERSION_PATCH
5
#define PROGRAM_VERSION_EXTRA ""
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#define PROGRAM_VERSION_EXTRA ""
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
@@
-3639,8
+3642,6
@@
extern int game_status;
extern boolean game_status_last_screen;
extern boolean level_editor_test_game;
extern boolean network_playing;
extern boolean game_status_last_screen;
extern boolean level_editor_test_game;
extern boolean network_playing;
-extern boolean network_server;
-extern SDL_Thread *server_thread;
extern int key_joystick_mapping;
extern int key_joystick_mapping;