projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added command to automatically patch tapes for the "EM random bug"
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 75ed2ee83d63b996b7eaade707a59523321359fe..92e4249219ab4967188c650488886d00600b659d 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
// ============================================================================
@@
-963,7
+963,7
@@
#define MAX_ELEMENTS_IN_GROUP 16
#define MIN_ANDROID_ELEMENTS 1
#define MAX_ANDROID_ELEMENTS 32
#define MAX_ELEMENTS_IN_GROUP 16
#define MIN_ANDROID_ELEMENTS 1
#define MAX_ANDROID_ELEMENTS 32
-#define MAX_ANDROID_ELEMENTS_OLD 16 // (extended
after version 4.1.4.1
)
+#define MAX_ANDROID_ELEMENTS_OLD 16 // (extended
since version 4.2.0.0
)
// values for elements with content
#define MIN_ELEMENT_CONTENTS 1
// values for elements with content
#define MIN_ELEMENT_CONTENTS 1
@@
-1898,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
@@
-2321,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,
@@
-2556,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
4
-#define PROGRAM_VERSION_PATCH
2
+#define PROGRAM_VERSION_MAJOR
2
+#define PROGRAM_VERSION_MINOR
0
+#define PROGRAM_VERSION_PATCH
3
#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"
@@
-3195,9
+3199,6
@@
struct LevelInfo
// runtime flags to handle bugs in old levels (not stored in level file)
boolean use_action_after_change_bug;
// runtime flags to handle bugs in old levels (not stored in level file)
boolean use_action_after_change_bug;
-
- // runtime flags to indicate level properties (not stored in level file)
- boolean has_mouse_events;
};
struct NetworkLevelInfo
};
struct NetworkLevelInfo
@@
-3218,6
+3219,11
@@
struct GlobalInfo
boolean autoplay_all;
boolean autoplay_mode;
boolean autoplay_all;
boolean autoplay_mode;
+ char *patchtapes_mode;
+ char *patchtapes_leveldir;
+ int patchtapes_level[MAX_TAPES_PER_SET];
+ boolean patchtapes_all;
+
char *convert_leveldir;
int convert_level_nr;
char *convert_leveldir;
int convert_level_nr;