projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed some variables and changed some initializations
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 88577ac27add45a3315bb7ee3e06e5d825640b5b..f6c90269592f2b9fc5ab03182ed7301106db513f 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-954,7
+954,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
@@
-2548,8
+2549,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
+2650,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
@@
-2723,6
+2729,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
+3116,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;