projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added storing current video vsync mode after setting it
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 1a23e6d1fa8cc178f1ce56ebad4a00bcd6330164..029f17434cdc6d4882c4c63c922b832eeb8c776f 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-4,7
+4,7
@@
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// http
s
://www.artsoft.org/
// ----------------------------------------------------------------------------
// main.h
// ============================================================================
// ----------------------------------------------------------------------------
// 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
@@
-1889,7
+1898,10
@@
#define EL_MM_END_2 (EL_DF_START2 + 430)
#define EL_MM_END EL_MM_END_2
#define EL_MM_END_2 (EL_DF_START2 + 430)
#define EL_MM_END EL_MM_END_2
-#define NUM_FILE_ELEMENTS 1215
+#define EL_SPRING_LEFT 1215
+#define EL_SPRING_RIGHT 1216
+
+#define NUM_FILE_ELEMENTS 1217
// "real" (and therefore drawable) runtime elements
// "real" (and therefore drawable) runtime elements
@@
-2312,6
+2324,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,
@@
-2547,16
+2560,16
@@
enum
// program information and versioning definitions
#define PROGRAM_VERSION_SUPER 4
// 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_MAJOR
2
+#define PROGRAM_VERSION_MINOR
0
+#define PROGRAM_VERSION_PATCH
2
#define PROGRAM_VERSION_EXTRA ""
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#define PROGRAM_AUTHOR_STRING "Holger Schemel"
#define PROGRAM_EMAIL_STRING "info@artsoft.org"
#define PROGRAM_VERSION_EXTRA ""
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#define PROGRAM_AUTHOR_STRING "Holger Schemel"
#define PROGRAM_EMAIL_STRING "info@artsoft.org"
-#define PROGRAM_WEBSITE_STRING "http://www.artsoft.org/"
-#define PROGRAM_COPYRIGHT_STRING "Copyright \xa9""1995-20
19
by Holger Schemel"
+#define PROGRAM_WEBSITE_STRING "http
s
://www.artsoft.org/"
+#define PROGRAM_COPYRIGHT_STRING "Copyright \xa9""1995-20
20
by Holger Schemel"
#define PROGRAM_COMPANY_STRING "A Game by Artsoft Entertainment"
#define PROGRAM_ICON_FILENAME "RocksIcon32x32.png"
#define PROGRAM_COMPANY_STRING "A Game by Artsoft Entertainment"
#define PROGRAM_ICON_FILENAME "RocksIcon32x32.png"
@@
-2680,6
+2693,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
@@
-3115,7
+3130,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;