projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added setup option to select default or low-pass sounds for EMC levels
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 88577ac27add45a3315bb7ee3e06e5d825640b5b..003b3b522936830fe0f559c21ca4b5b95b3bcebb 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-252,11
+252,18
@@
#define CE_VALUE_CHANGES_OF_X 41
#define CE_SCORE_CHANGES 42
#define CE_SCORE_CHANGES_OF_X 43
#define CE_VALUE_CHANGES_OF_X 41
#define CE_SCORE_CHANGES 42
#define CE_SCORE_CHANGES_OF_X 43
+#define CE_CLICKED_BY_MOUSE 44
+#define CE_PRESSED_BY_MOUSE 45
+#define CE_MOUSE_CLICKED_ON_X 46
+#define CE_MOUSE_PRESSED_ON_X 47
-#define NUM_CHANGE_EVENTS 4
4
+#define NUM_CHANGE_EVENTS 4
8
#define NUM_CE_BITFIELDS ((NUM_CHANGE_EVENTS + 31) / 32)
#define NUM_CE_BITFIELDS ((NUM_CHANGE_EVENTS + 31) / 32)
+#define CE_HEADLINE_SPECIAL_EVENTS 250
+#define CE_UNDEFINED 255
+
#define CE_BITMASK_DEFAULT 0
#define CH_EVENT_BITFIELD_NR(e) (e / 32)
#define CE_BITMASK_DEFAULT 0
#define CH_EVENT_BITFIELD_NR(e) (e / 32)
@@
-366,6
+373,7
@@
#define CA_SET_PLAYER_INVENTORY 18
#define CA_SET_CE_ARTWORK 19
#define CA_SET_LEVEL_RANDOM_SEED 20
#define CA_SET_PLAYER_INVENTORY 18
#define CA_SET_CE_ARTWORK 19
#define CA_SET_LEVEL_RANDOM_SEED 20
+#define CA_MOVE_PLAYER_NEW 21
#define CA_HEADLINE_LEVEL_ACTIONS 250
#define CA_HEADLINE_PLAYER_ACTIONS 251
#define CA_HEADLINE_LEVEL_ACTIONS 250
#define CA_HEADLINE_PLAYER_ACTIONS 251
@@
-954,7
+962,8
@@
#define MIN_ELEMENTS_IN_GROUP 1
#define MAX_ELEMENTS_IN_GROUP 16
#define MIN_ANDROID_ELEMENTS 1
#define MIN_ELEMENTS_IN_GROUP 1
#define MAX_ELEMENTS_IN_GROUP 16
#define MIN_ANDROID_ELEMENTS 1
-#define MAX_ANDROID_ELEMENTS 16
+#define MAX_ANDROID_ELEMENTS 32
+#define MAX_ANDROID_ELEMENTS_OLD 16 // (extended after version 4.1.4.1)
// values for elements with content
#define MIN_ELEMENT_CONTENTS 1
// values for elements with content
#define MIN_ELEMENT_CONTENTS 1
@@
-2312,6
+2321,7
@@
enum
{
GFX_SPECIAL_ARG_SETUP_MAIN = 0,
GFX_SPECIAL_ARG_SETUP_GAME,
{
GFX_SPECIAL_ARG_SETUP_MAIN = 0,
GFX_SPECIAL_ARG_SETUP_GAME,
+ GFX_SPECIAL_ARG_SETUP_ENGINES,
GFX_SPECIAL_ARG_SETUP_EDITOR,
GFX_SPECIAL_ARG_SETUP_GRAPHICS,
GFX_SPECIAL_ARG_SETUP_SOUND,
GFX_SPECIAL_ARG_SETUP_EDITOR,
GFX_SPECIAL_ARG_SETUP_GRAPHICS,
GFX_SPECIAL_ARG_SETUP_SOUND,
@@
-2548,8
+2558,8
@@
enum
// program information and versioning definitions
#define PROGRAM_VERSION_SUPER 4
#define PROGRAM_VERSION_MAJOR 1
// program information and versioning definitions
#define PROGRAM_VERSION_SUPER 4
#define PROGRAM_VERSION_MAJOR 1
-#define PROGRAM_VERSION_MINOR
3
-#define PROGRAM_VERSION_PATCH
1
+#define PROGRAM_VERSION_MINOR
4
+#define PROGRAM_VERSION_PATCH
2
#define PROGRAM_VERSION_EXTRA ""
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#define PROGRAM_VERSION_EXTRA ""
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
@@
-2649,10
+2659,15
@@
struct RequestButtonInfo
struct TextPosInfo yes;
struct TextPosInfo no;
struct TextPosInfo confirm;
struct TextPosInfo yes;
struct TextPosInfo no;
struct TextPosInfo confirm;
+
struct TextPosInfo player_1;
struct TextPosInfo player_2;
struct TextPosInfo player_3;
struct TextPosInfo player_4;
struct TextPosInfo player_1;
struct TextPosInfo player_2;
struct TextPosInfo player_3;
struct TextPosInfo player_4;
+
+ struct TextPosInfo touch_yes;
+ struct TextPosInfo touch_no;
+ struct TextPosInfo touch_confirm;
};
struct MenuMainButtonInfo
};
struct MenuMainButtonInfo
@@
-2675,6
+2690,8
@@
struct MenuMainButtonInfo
struct MenuPosInfo insert_solution;
struct MenuPosInfo play_solution;
struct MenuPosInfo insert_solution;
struct MenuPosInfo play_solution;
+
+ struct MenuPosInfo switch_ecs_aga;
};
struct MenuMainTextInfo
};
struct MenuMainTextInfo
@@
-2723,6
+2740,11
@@
struct MenuSetupButtonInfo
{
struct MenuPosInfo prev_player;
struct MenuPosInfo next_player;
{
struct MenuPosInfo prev_player;
struct MenuPosInfo next_player;
+
+ struct MenuPosInfo touch_back;
+ struct MenuPosInfo touch_next;
+ struct MenuPosInfo touch_back2;
+ struct MenuPosInfo touch_next2;
};
struct MenuSetupInfo
};
struct MenuSetupInfo
@@
-3105,7
+3127,7
@@
struct LevelInfo
int android_move_time;
int android_clone_time;
boolean ball_random;
int android_move_time;
int android_clone_time;
boolean ball_random;
- boolean ball_
stat
e_initial;
+ boolean ball_
activ
e_initial;
int ball_time;
int lenses_score;
int magnify_score;
int ball_time;
int lenses_score;
int magnify_score;