projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040321-1-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 84697de8fc61c16b39bcf2c4c400fc291a4fb391..9e6c625113b303487b82ea919fb63e9e36bef371 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-58,8
+58,11
@@
short WasJustFalling[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaCnt[MAX_NUM_AMOEBA];
short AmoebaCnt2[MAX_NUM_AMOEBA];
short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaCnt[MAX_NUM_AMOEBA];
short AmoebaCnt2[MAX_NUM_AMOEBA];
-short ExplodePhase[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short ExplodePhase[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short ExplodeDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+int RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+int PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
unsigned long Properties[MAX_NUM_ELEMENTS][NUM_EP_BITFIELDS];
unsigned long Properties[MAX_NUM_ELEMENTS][NUM_EP_BITFIELDS];
@@
-87,7
+90,7
@@
int ZX, ZY;
int ExitX, ExitY;
int AllPlayersGone;
int ExitX, ExitY;
int AllPlayersGone;
-int TimeFrames, TimePlayed, TimeLeft;
+int TimeFrames, TimePlayed, TimeLeft
, TapeTime
;
boolean network_player_action_received = FALSE;
boolean network_player_action_received = FALSE;
@@
-105,7
+108,8
@@
struct GraphicInfo *graphic_info = NULL;
struct SoundInfo *sound_info = NULL;
struct MusicInfo *music_info = NULL;
struct MusicFileInfo *music_file_info = NULL;
struct SoundInfo *sound_info = NULL;
struct MusicInfo *music_info = NULL;
struct MusicFileInfo *music_file_info = NULL;
-struct InfoAnimationInfo *info_animation_info = NULL;
+struct HelpAnimInfo *helpanim_info = NULL;
+SetupFileHash *helptext_info = NULL;
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
@@
-433,9
+437,9
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"invisible steel wall"
},
{
"invisible steel wall"
},
{
- "
unused_63
",
- "
unused
",
- "
(not used)
"
+ "
sokoban_field_player
",
+ "
sokoban
",
+ "
sokoban field with player
"
},
{
"dynabomb_increase_number",
},
{
"dynabomb_increase_number",
@@
-654,7
+658,7
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
{
"black_orb",
"black_orb",
{
"black_orb",
"black_orb",
- "bomb"
+ "b
lack orb b
omb"
},
{
"amoeba_to_diamond",
},
{
"amoeba_to_diamond",
@@
-3231,6
+3235,181
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"envelope",
"mail envelope 4"
},
"envelope",
"mail envelope 4"
},
+ {
+ "group_1",
+ "group",
+ "group element 1"
+ },
+ {
+ "group_2",
+ "group",
+ "group element 2"
+ },
+ {
+ "group_3",
+ "group",
+ "group element 3"
+ },
+ {
+ "group_4",
+ "group",
+ "group element 4"
+ },
+ {
+ "group_5",
+ "group",
+ "group element 5"
+ },
+ {
+ "group_6",
+ "group",
+ "group element 6"
+ },
+ {
+ "group_7",
+ "group",
+ "group element 7"
+ },
+ {
+ "group_8",
+ "group",
+ "group element 8"
+ },
+ {
+ "group_9",
+ "group",
+ "group element 9"
+ },
+ {
+ "group_10",
+ "group",
+ "group element 10"
+ },
+ {
+ "group_11",
+ "group",
+ "group element 11"
+ },
+ {
+ "group_12",
+ "group",
+ "group element 12"
+ },
+ {
+ "group_13",
+ "group",
+ "group element 13"
+ },
+ {
+ "group_14",
+ "group",
+ "group element 14"
+ },
+ {
+ "group_15",
+ "group",
+ "group element 15"
+ },
+ {
+ "group_16",
+ "group",
+ "group element 16"
+ },
+ {
+ "group_17",
+ "group",
+ "group element 17"
+ },
+ {
+ "group_18",
+ "group",
+ "group element 18"
+ },
+ {
+ "group_19",
+ "group",
+ "group element 19"
+ },
+ {
+ "group_20",
+ "group",
+ "group element 20"
+ },
+ {
+ "group_21",
+ "group",
+ "group element 21"
+ },
+ {
+ "group_22",
+ "group",
+ "group element 22"
+ },
+ {
+ "group_23",
+ "group",
+ "group element 23"
+ },
+ {
+ "group_24",
+ "group",
+ "group element 24"
+ },
+ {
+ "group_25",
+ "group",
+ "group element 25"
+ },
+ {
+ "group_26",
+ "group",
+ "group element 26"
+ },
+ {
+ "group_27",
+ "group",
+ "group element 27"
+ },
+ {
+ "group_28",
+ "group",
+ "group element 28"
+ },
+ {
+ "group_29",
+ "group",
+ "group element 29"
+ },
+ {
+ "group_30",
+ "group",
+ "group element 30"
+ },
+ {
+ "group_31",
+ "group",
+ "group element 31"
+ },
+ {
+ "group_32",
+ "group",
+ "group element 32"
+ },
+ {
+ "unknown",
+ "unknown",
+ "unknown element"
+ },
+ {
+ "trigger_element",
+ "trigger",
+ "element triggering change"
+ },
+ {
+ "trigger_player",
+ "trigger",
+ "player triggering change"
+ },
/* ----------------------------------------------------------------------- */
/* "real" (and therefore drawable) runtime elements */
/* ----------------------------------------------------------------------- */
/* "real" (and therefore drawable) runtime elements */
@@
-3521,6
+3700,26
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-",
"-"
},
"-",
"-"
},
+ {
+ "player_is_exploding_1",
+ "-",
+ "-"
+ },
+ {
+ "player_is_exploding_2",
+ "-",
+ "-"
+ },
+ {
+ "player_is_exploding_3",
+ "-",
+ "-"
+ },
+ {
+ "player_is_exploding_4",
+ "-",
+ "-"
+ },
{
"quicksand.filling",
"quicksand",
{
"quicksand.filling",
"quicksand",
@@
-3667,8
+3866,23
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-"
},
{
"-"
},
{
- "dummy",
- "dummy",
+ "internal_clipboard_custom",
+ "internal",
+ "empty custom element"
+ },
+ {
+ "internal_clipboard_change",
+ "internal",
+ "empty change page"
+ },
+ {
+ "internal_clipboard_group",
+ "internal",
+ "empty group element"
+ },
+ {
+ "internal_dummy",
+ "internal",
"-"
},
"-"
},
@@
-3898,6
+4112,8
@@
static void print_usage()
" \"print soundsinfo.conf\" print default sounds config\n"
" \"print musicinfo.conf\" print default music config\n"
" \"print editorsetup.conf\" print default editor config\n"
" \"print soundsinfo.conf\" print default sounds config\n"
" \"print musicinfo.conf\" print default music config\n"
" \"print editorsetup.conf\" print default editor config\n"
+ " \"print helpanim.conf\" print default helpanim config\n"
+ " \"print helptext.conf\" print default helptext config\n"
" \"dump level FILE\" dump level data from FILE\n"
" \"dump tape FILE\" dump tape data from FILE\n"
" \"autoplay LEVELDIR\" play level tapes for LEVELDIR\n"
" \"dump level FILE\" dump level data from FILE\n"
" \"dump tape FILE\" dump tape data from FILE\n"
" \"autoplay LEVELDIR\" play level tapes for LEVELDIR\n"