projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19990314-2-src
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 0a52d8f5e96a6ef0fe5f3eb9bd570dd730ad4ca1..a625102cc706ac76f1b88198b4b14af8dd878bba 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-126,6
+126,7
@@
typedef unsigned char byte;
#define EP_BIT_SP_ELEMENT (1 << 28)
#define EP_BIT_QUICK_GATE (1 << 29)
#define EP_BIT_OVER_PLAYER (1 << 30)
#define EP_BIT_SP_ELEMENT (1 << 28)
#define EP_BIT_QUICK_GATE (1 << 29)
#define EP_BIT_OVER_PLAYER (1 << 30)
+#define EP_BIT_ACTIVE_BOMB (1 << 31)
#define IS_AMOEBALIVE(e) (Elementeigenschaften[e] & EP_BIT_AMOEBALIVE)
#define IS_AMOEBOID(e) (Elementeigenschaften[e] & EP_BIT_AMOEBOID)
#define IS_AMOEBALIVE(e) (Elementeigenschaften[e] & EP_BIT_AMOEBALIVE)
#define IS_AMOEBOID(e) (Elementeigenschaften[e] & EP_BIT_AMOEBOID)
@@
-158,6
+159,7
@@
typedef unsigned char byte;
#define IS_SP_ELEMENT(e) (Elementeigenschaften[e] & EP_BIT_SP_ELEMENT)
#define IS_QUICK_GATE(e) (Elementeigenschaften[e] & EP_BIT_QUICK_GATE)
#define IS_OVER_PLAYER(e) (Elementeigenschaften[e] & EP_BIT_OVER_PLAYER)
#define IS_SP_ELEMENT(e) (Elementeigenschaften[e] & EP_BIT_SP_ELEMENT)
#define IS_QUICK_GATE(e) (Elementeigenschaften[e] & EP_BIT_QUICK_GATE)
#define IS_OVER_PLAYER(e) (Elementeigenschaften[e] & EP_BIT_OVER_PLAYER)
+#define IS_ACTIVE_BOMB(e) (Elementeigenschaften[e] & EP_BIT_ACTIVE_BOMB)
#define IS_PLAYER(x,y) (ELEM_IS_PLAYER(StorePlayer[x][y]))
#define IS_PLAYER(x,y) (ELEM_IS_PLAYER(StorePlayer[x][y]))
@@
-234,7
+236,8
@@
struct OptionInfo
char *display_name;
char *server_host;
int server_port;
char *display_name;
char *server_host;
int server_port;
- char *base_directory;
+ char *ro_base_directory;
+ char *rw_base_directory;
char *level_directory;
boolean serveronly;
boolean network;
char *level_directory;
boolean serveronly;
boolean network;
@@
-600,7
+603,7
@@
extern char *element_info[];
#define EL_KOKOSNUSS 25
#define EL_LIFE 26
#define EL_LIFE_ASYNC 27
#define EL_KOKOSNUSS 25
#define EL_LIFE 26
#define EL_LIFE_ASYNC 27
-#define EL_DYNAMIT
28
+#define EL_DYNAMIT
E_ACTIVE
28
#define EL_BADEWANNE 29
#define EL_ABLENK_AUS 30
#define EL_ABLENK_EIN 31
#define EL_BADEWANNE 29
#define EL_ABLENK_AUS 30
#define EL_ABLENK_EIN 31
@@
-616,7
+619,7
@@
extern char *element_info[];
#define EL_PFORTE2X 41
#define EL_PFORTE3X 42
#define EL_PFORTE4X 43
#define EL_PFORTE2X 41
#define EL_PFORTE3X 42
#define EL_PFORTE4X 43
-#define EL_DYNAMIT
_AUS
44
+#define EL_DYNAMIT
E_INACTIVE
44
#define EL_PACMAN 45
#define EL_UNSICHTBAR 46
#define EL_BIRNE_AUS 47
#define EL_PACMAN 45
#define EL_UNSICHTBAR 46
#define EL_BIRNE_AUS 47
@@
-635,7
+638,9
@@
extern char *element_info[];
#define EL_MAMPFER2 60
#define EL_SIEB2_INAKTIV 61
#define EL_INVISIBLE_STEEL 62
#define EL_MAMPFER2 60
#define EL_SIEB2_INAKTIV 61
#define EL_INVISIBLE_STEEL 62
-#define EL_DYNABOMB 63
+
+#define EL_UNUSED_63 63
+
#define EL_DYNABOMB_NR 64
#define EL_DYNABOMB_SZ 65
#define EL_DYNABOMB_XL 66
#define EL_DYNABOMB_NR 64
#define EL_DYNABOMB_SZ 65
#define EL_DYNABOMB_XL 66
@@
-823,6
+828,10
@@
extern char *element_info[];
#define EL_EM_KEY_2 310
#define EL_EM_KEY_3 311
#define EL_EM_KEY_4 312
#define EL_EM_KEY_2 310
#define EL_EM_KEY_3 311
#define EL_EM_KEY_4 312
+#define EL_DYNABOMB_ACTIVE_1 313
+#define EL_DYNABOMB_ACTIVE_2 314
+#define EL_DYNABOMB_ACTIVE_3 315
+#define EL_DYNABOMB_ACTIVE_4 316
/* "unreal" (and therefore not drawable) runtime elements */
#define EL_BLOCKED 400
/* "unreal" (and therefore not drawable) runtime elements */
#define EL_BLOCKED 400
@@
-1265,8
+1274,9
@@
extern char *element_info[];
#define SND_SP_BOOOM 58
#define SND_SP_EXIT 59
#define SND_EMPTY 60
#define SND_SP_BOOOM 58
#define SND_SP_EXIT 59
#define SND_EMPTY 60
+#define SND_GATE 61
-#define NUM_SOUNDS 6
1
+#define NUM_SOUNDS 6
2
/* default input keys */
#define KEY_UNDEFINDED XK_VoidSymbol
/* default input keys */
#define KEY_UNDEFINDED XK_VoidSymbol
@@
-1311,11
+1321,16
@@
extern char *element_info[];
#define SETUPINPUT 9
#define CALIBRATION 10
#define SETUPINPUT 9
#define CALIBRATION 10
-#ifndef GAME_DIR
-#define GAME_DIR "."
+#ifndef RO_GAME_DIR
+#define RO_GAME_DIR "."
+#endif
+
+#ifndef RW_GAME_DIR
+#define RW_GAME_DIR "."
#endif
#endif
-#define BASE_PATH GAME_DIR
+#define RO_BASE_PATH RO_GAME_DIR
+#define RW_BASE_PATH RW_GAME_DIR
#define GRAPHICS_DIRECTORY "graphics"
#define SOUNDS_DIRECTORY "sounds"
#define GRAPHICS_DIRECTORY "graphics"
#define SOUNDS_DIRECTORY "sounds"