projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20050606-1-src
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 1297f845e783266a02c9251c2a4d9298777ec1b5..7f6e8c6c40cb91f72a3591954a4384dc1fc154a6 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-553,7
+553,8
@@
#define MAX_LEVEL_NAME_LEN 32
#define MAX_LEVEL_AUTHOR_LEN 32
#define MAX_ELEMENT_NAME_LEN 32
#define MAX_LEVEL_NAME_LEN 32
#define MAX_LEVEL_AUTHOR_LEN 32
#define MAX_ELEMENT_NAME_LEN 32
-#define MAX_TAPELEN (1000 * FRAMES_PER_SECOND) /* max.time x fps */
+#define MAX_TAPE_LEN (1000 * FRAMES_PER_SECOND) /* max.time x fps */
+#define MAX_TAPES_PER_SET 1024
#define MAX_SCORE_ENTRIES 100
#define MAX_NUM_AMOEBA 100
#define MAX_INVENTORY_SIZE 1000
#define MAX_SCORE_ENTRIES 100
#define MAX_NUM_AMOEBA 100
#define MAX_INVENTORY_SIZE 1000
@@
-1492,7
+1493,7
@@
struct PlayerInfo
boolean use_murphy_graphic;
boolean block_last_field;
boolean use_murphy_graphic;
boolean block_last_field;
- int block_delay
;
+ int block_delay
_adjustment; /* needed for different engine versions */
boolean can_fall_into_acid;
boolean can_fall_into_acid;
@@
-1651,8
+1652,11
@@
struct LevelInfo
boolean block_last_field; /* player blocks previous field while moving */
boolean sp_block_last_field; /* player blocks previous field while moving */
boolean block_last_field; /* player blocks previous field while moving */
boolean sp_block_last_field; /* player blocks previous field while moving */
+
+#if 0 /* !!! THIS IS NOT A LEVEL SETTING => LOGIC MOVED TO "game.c" !!! */
int block_delay; /* delay for blocking previous field */
int sp_block_delay; /* delay for blocking previous field */
int block_delay; /* delay for blocking previous field */
int sp_block_delay; /* delay for blocking previous field */
+#endif
/* ('int' instead of 'boolean' because used as selectbox value in editor) */
int use_step_counter; /* count steps instead of seconds for level */
/* ('int' instead of 'boolean' because used as selectbox value in editor) */
int use_step_counter; /* count steps instead of seconds for level */
@@
-1697,7
+1701,7
@@
struct TapeInfo
{
byte action[MAX_PLAYERS];
byte delay;
{
byte action[MAX_PLAYERS];
byte delay;
- } pos[MAX_TAPELEN];
+ } pos[MAX_TAPE
_
LEN];
boolean no_valid_file; /* set when tape file missing or invalid */
};
boolean no_valid_file; /* set when tape file missing or invalid */
};
@@
-1717,7
+1721,8
@@
struct GameInfo
/* flags to handle bugs in and changes between different engine versions */
/* (for the latest engine version, these flags should always be "FALSE") */
/* flags to handle bugs in and changes between different engine versions */
/* (for the latest engine version, these flags should always be "FALSE") */
- boolean use_bug_change_when_pushing;
+ boolean use_change_when_pushing_bug;
+ boolean use_block_last_field_bug;
/* variable within running game */
int yamyam_content_nr;
/* variable within running game */
int yamyam_content_nr;
@@
-1743,7
+1748,8
@@
struct GameInfo
struct GlobalInfo
{
char *autoplay_leveldir;
struct GlobalInfo
{
char *autoplay_leveldir;
- int autoplay_level_nr;
+ int autoplay_level[MAX_TAPES_PER_SET];
+ boolean autoplay_all;
char *convert_leveldir;
int convert_level_nr;
char *convert_leveldir;
int convert_level_nr;