projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rocksndiamonds-3.1.2
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 52d7fb81b57ffa5db7dbeee3179bd625b8b49984..2de55a4e53d280cdbe06df2ffa67c4c25877d8dc 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-550,6
+550,9
@@
#define PLAYER_SWITCHING(p,x,y) ((p)->is_switching && \
(p)->switch_x == (x) && (p)->switch_y == (y))
#define PLAYER_SWITCHING(p,x,y) ((p)->is_switching && \
(p)->switch_x == (x) && (p)->switch_y == (y))
+#define PLAYER_DROPPING(p,x,y) ((p)->is_dropping && \
+ (p)->drop_x == (x) && (p)->drop_y == (y))
+
#define PLAYER_NR_GFX(g,i) ((g) + i * (IMG_PLAYER_2 - IMG_PLAYER_1))
#define ANIM_FRAMES(g) (graphic_info[g].anim_frames)
#define PLAYER_NR_GFX(g,i) ((g) + i * (IMG_PLAYER_2 - IMG_PLAYER_1))
#define ANIM_FRAMES(g) (graphic_info[g].anim_frames)
@@
-1385,14
+1388,16
@@
/* program information and versioning definitions */
/* program information and versioning definitions */
+#define RELEASE_312 TRUE
+
#define PROGRAM_VERSION_MAJOR 3
#define PROGRAM_VERSION_MAJOR 3
-#define PROGRAM_VERSION_MINOR
2
-#define PROGRAM_VERSION_PATCH
0
-#define PROGRAM_VERSION_BUILD
3
+#define PROGRAM_VERSION_MINOR
1
+#define PROGRAM_VERSION_PATCH
2
+#define PROGRAM_VERSION_BUILD
0
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#define PROGRAM_AUTHOR_STRING "Holger Schemel"
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#define PROGRAM_AUTHOR_STRING "Holger Schemel"
-#define PROGRAM_COPYRIGHT_STRING "Copyright ©1995-200
4
by Holger Schemel"
+#define PROGRAM_COPYRIGHT_STRING "Copyright ©1995-200
6
by Holger Schemel"
#define ICON_TITLE_STRING PROGRAM_TITLE_STRING
#define COOKIE_PREFIX "ROCKSNDIAMONDS"
#define ICON_TITLE_STRING PROGRAM_TITLE_STRING
#define COOKIE_PREFIX "ROCKSNDIAMONDS"
@@
-1551,6
+1556,7
@@
struct PlayerInfo
int num_special_action_sleeping;
int switch_x, switch_y;
int num_special_action_sleeping;
int switch_x, switch_y;
+ int drop_x, drop_y;
int show_envelope;
int show_envelope;