projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030220-1-src
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 468f910d533f933555ba697fed41356c9cb1702d..7664426e19ae4c1d533d0340b02f470bee4ca28c 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-420,10
+420,10
@@
#define EL_MOLE 110
#define EL_PENGUIN 111
#define EL_SATELLITE 112
#define EL_MOLE 110
#define EL_PENGUIN 111
#define EL_SATELLITE 112
-#define EL_ARROW_
BLUE_LEFT
113
-#define EL_ARROW_
BLUE_RIGHT
114
-#define EL_ARROW_
BLUE_UP
115
-#define EL_ARROW_
BLUE_DOWN
116
+#define EL_ARROW_
LEFT
113
+#define EL_ARROW_
RIGHT
114
+#define EL_ARROW_
UP
115
+#define EL_ARROW_
DOWN
116
#define EL_PIG 117
#define EL_DRAGON 118
#define EL_PIG 117
#define EL_DRAGON 118
@@
-721,12
+721,8
@@
#define EL_DYNABOMB_ACTIVE (EL_FIRST_DUMMY + 13)
#define EL_SHIELD_NORMAL_ACTIVE (EL_FIRST_DUMMY + 14)
#define EL_SHIELD_DEADLY_ACTIVE (EL_FIRST_DUMMY + 15)
#define EL_DYNABOMB_ACTIVE (EL_FIRST_DUMMY + 13)
#define EL_SHIELD_NORMAL_ACTIVE (EL_FIRST_DUMMY + 14)
#define EL_SHIELD_DEADLY_ACTIVE (EL_FIRST_DUMMY + 15)
-#define EL_ARROW_RED_LEFT (EL_FIRST_DUMMY + 16)
-#define EL_ARROW_RED_RIGHT (EL_FIRST_DUMMY + 17)
-#define EL_ARROW_RED_UP (EL_FIRST_DUMMY + 18)
-#define EL_ARROW_RED_DOWN (EL_FIRST_DUMMY + 19)
-#define MAX_NUM_ELEMENTS (EL_FIRST_DUMMY +
20
)
+#define MAX_NUM_ELEMENTS (EL_FIRST_DUMMY +
16
)
/* values for graphics/sounds action types */
/* values for graphics/sounds action types */
@@
-786,9
+782,11
@@
#define GFX_ARG_STEP_DELAY 21
#define GFX_ARG_DIRECTION 22
#define GFX_ARG_POSITION 23
#define GFX_ARG_STEP_DELAY 21
#define GFX_ARG_DIRECTION 22
#define GFX_ARG_POSITION 23
-#define GFX_ARG_NAME 24
+#define GFX_ARG_DRAW_XOFFSET 24
+#define GFX_ARG_DRAW_YOFFSET 25
+#define GFX_ARG_NAME 26
-#define NUM_GFX_ARGS 2
5
+#define NUM_GFX_ARGS 2
7
/* values for sound configuration suffixes */
/* values for sound configuration suffixes */
@@
-797,6
+795,16
@@
#define NUM_SND_ARGS 1
#define NUM_SND_ARGS 1
+/* values for font configuration */
+
+#define FIRST_IMG_FONT IMG_FONT_INITIAL_1
+#define LAST_IMG_FONT IMG_FONT_NARROW
+
+#define NUM_IMG_FONTS (LAST_IMG_FONT - \
+ FIRST_IMG_FONT + 1)
+#define NUM_INITIAL_FONTS 4
+
+
/* values for game_status */
#define EXITGAME 0
#define MAINMENU 1
/* values for game_status */
#define EXITGAME 0
#define MAINMENU 1
@@
-886,13
+894,20
@@
struct PlayerInfo
int MovDir, MovPos, GfxPos;
int Frame;
int MovDir, MovPos, GfxPos;
int Frame;
+ int GfxAction;
+
+ boolean use_murphy_graphic;
+
boolean Pushing;
boolean Switching;
boolean LevelSolved, GameOver;
boolean snapped;
int last_move_dir;
boolean Pushing;
boolean Switching;
boolean LevelSolved, GameOver;
boolean snapped;
int last_move_dir;
- int is_moving;
+ boolean is_moving;
+
+ boolean is_digging;
+ boolean is_waiting;
unsigned long move_delay;
int move_delay_value;
unsigned long move_delay;
int move_delay_value;
@@
-1040,9
+1055,12
@@
struct GraphicInfo
int anim_delay; /* important: delay of 1 means "no delay"! */
int anim_mode;
boolean anim_global_sync;
int anim_delay; /* important: delay of 1 means "no delay"! */
int anim_mode;
boolean anim_global_sync;
+
int step_offset; /* optional step offset of toon animations */
int step_delay; /* optional step delay of toon animations */
int step_offset; /* optional step offset of toon animations */
int step_delay; /* optional step delay of toon animations */
+ int draw_x, draw_y; /* optional offset for drawing fonts chars */
+
#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
Pixmap clip_mask; /* single-graphic-only clip mask for X11 */
GC clip_gc; /* single-graphic-only clip gc for X11 */
#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
Pixmap clip_mask; /* single-graphic-only clip mask for X11 */
GC clip_gc; /* single-graphic-only clip gc for X11 */