projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed comments from old to new style (multiple-line comments)
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 75818dfc67d0fad777102152de3d377e7b2edbb0..f35974bce5fd4c18a40ff7e1bd615522a0f9c83f 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-42,6
+42,7
@@
SDL_Thread *server_thread;
int key_joystick_mapping = 0;
short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int key_joystick_mapping = 0;
short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short Last[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@
-133,7
+134,6
@@
int TimeFrames, TimePlayed, TimeLeft, TapeTime;
boolean network_player_action_received = FALSE;
boolean network_player_action_received = FALSE;
-struct LevelSetInfo levelset;
struct LevelInfo level, level_template;
struct PlayerInfo stored_player[MAX_PLAYERS], *local_player = NULL;
struct HiScore highscore[MAX_SCORE_ENTRIES];
struct LevelInfo level, level_template;
struct PlayerInfo stored_player[MAX_PLAYERS], *local_player = NULL;
struct HiScore highscore[MAX_SCORE_ENTRIES];
@@
-186,20
+186,20
@@
SetupFileHash *font_token_hash = NULL;
SetupFileHash *hide_setup_hash = NULL;
SetupFileHash *hide_setup_hash = NULL;
-/
* ------------------------------------------------------------------------- */
-/
* element definitions */
-/
* ------------------------------------------------------------------------- */
+/
/ ----------------------------------------------------------------------------
+/
/ element definitions
+/
/ ----------------------------------------------------------------------------
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1];
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1];
-/
* this contains predefined structure elements to initialize "element_info" */
+/
/ this contains predefined structure elements to initialize "element_info"
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
- /
* keyword to start parser: "ELEMENT_INFO_START" <-- do not change! */
+ /
/ keyword to start parser: "ELEMENT_INFO_START" <-- do not change!
- /
* ----------------------------------------------------------------------- */
- /
* "real" level file elements */
- /
* ----------------------------------------------------------------------- */
+ /
/ --------------------------------------------------------------------------
+ /
/ "real" level file elements
+ /
/ --------------------------------------------------------------------------
{
"empty_space",
{
"empty_space",
@@
-4518,7
+4518,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
"mm_empty_space",
"empty_space",
{
"mm_empty_space",
"empty_space",
- "empty
_
space"
+ "empty
space"
},
{
"mm_mirror_1",
},
{
"mm_mirror_1",
@@
-4603,22
+4603,22
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
"mm_steel_grid_fixed_1",
"mm_steel_grid_fixed",
{
"mm_steel_grid_fixed_1",
"mm_steel_grid_fixed",
- "fixed steel polari
sato
r (0\xb0)"
+ "fixed steel polari
ze
r (0\xb0)"
},
{
"mm_steel_grid_fixed_2",
"mm_steel_grid_fixed",
},
{
"mm_steel_grid_fixed_2",
"mm_steel_grid_fixed",
- "fixed steel polari
sato
r (90\xb0)"
+ "fixed steel polari
ze
r (90\xb0)"
},
{
"mm_steel_grid_fixed_3",
"mm_steel_grid_fixed",
},
{
"mm_steel_grid_fixed_3",
"mm_steel_grid_fixed",
- "fixed steel polari
sato
r (45\xb0)"
+ "fixed steel polari
ze
r (45\xb0)"
},
{
"mm_steel_grid_fixed_4",
"mm_steel_grid_fixed",
},
{
"mm_steel_grid_fixed_4",
"mm_steel_grid_fixed",
- "fixed steel polari
sato
r (135\xb0)"
+ "fixed steel polari
ze
r (135\xb0)"
},
{
"mm_mcduffin.right",
},
{
"mm_mcduffin.right",
@@
-5006,84
+5006,84
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"gray ball"
},
{
"gray ball"
},
{
- "mm_
beam
er_1",
- "mm_
beam
er",
- "
beam
er (0\xb0)"
+ "mm_
teleport
er_1",
+ "mm_
teleport
er",
+ "
teleport
er (0\xb0)"
},
{
},
{
- "mm_
beam
er_2",
- "mm_
beam
er",
- "
beam
er (22.5\xb0)"
+ "mm_
teleport
er_2",
+ "mm_
teleport
er",
+ "
teleport
er (22.5\xb0)"
},
{
},
{
- "mm_
beam
er_3",
- "mm_
beam
er",
- "
beam
er (45\xb0)"
+ "mm_
teleport
er_3",
+ "mm_
teleport
er",
+ "
teleport
er (45\xb0)"
},
{
},
{
- "mm_
beam
er_4",
- "mm_
beam
er",
- "
beam
er (67.5\xb0)"
+ "mm_
teleport
er_4",
+ "mm_
teleport
er",
+ "
teleport
er (67.5\xb0)"
},
{
},
{
- "mm_
beam
er_5",
- "mm_
beam
er",
- "
beam
er (90\xb0)"
+ "mm_
teleport
er_5",
+ "mm_
teleport
er",
+ "
teleport
er (90\xb0)"
},
{
},
{
- "mm_
beam
er_6",
- "mm_
beam
er",
- "
beam
er (112.5\xb0)"
+ "mm_
teleport
er_6",
+ "mm_
teleport
er",
+ "
teleport
er (112.5\xb0)"
},
{
},
{
- "mm_
beam
er_7",
- "mm_
beam
er",
- "
beam
er (135\xb0)"
+ "mm_
teleport
er_7",
+ "mm_
teleport
er",
+ "
teleport
er (135\xb0)"
},
{
},
{
- "mm_
beam
er_8",
- "mm_
beam
er",
- "
beam
er (157.5\xb0)"
+ "mm_
teleport
er_8",
+ "mm_
teleport
er",
+ "
teleport
er (157.5\xb0)"
},
{
},
{
- "mm_
beam
er_9",
- "mm_
beam
er",
- "
beam
er (180\xb0)"
+ "mm_
teleport
er_9",
+ "mm_
teleport
er",
+ "
teleport
er (180\xb0)"
},
{
},
{
- "mm_
beam
er_10",
- "mm_
beam
er",
- "
beam
er (202.5\xb0)"
+ "mm_
teleport
er_10",
+ "mm_
teleport
er",
+ "
teleport
er (202.5\xb0)"
},
{
},
{
- "mm_
beam
er_11",
- "mm_
beam
er",
- "
beam
er (225\xb0)"
+ "mm_
teleport
er_11",
+ "mm_
teleport
er",
+ "
teleport
er (225\xb0)"
},
{
},
{
- "mm_
beam
er_12",
- "mm_
beam
er",
- "
beam
er (247.5\xb0)"
+ "mm_
teleport
er_12",
+ "mm_
teleport
er",
+ "
teleport
er (247.5\xb0)"
},
{
},
{
- "mm_
beam
er_13",
- "mm_
beam
er",
- "
beam
er (270\xb0)"
+ "mm_
teleport
er_13",
+ "mm_
teleport
er",
+ "
teleport
er (270\xb0)"
},
{
},
{
- "mm_
beam
er_14",
- "mm_
beam
er",
- "
beam
er (292.5\xb0)"
+ "mm_
teleport
er_14",
+ "mm_
teleport
er",
+ "
teleport
er (292.5\xb0)"
},
{
},
{
- "mm_
beam
er_15",
- "mm_
beam
er",
- "
beam
er (315\xb0)"
+ "mm_
teleport
er_15",
+ "mm_
teleport
er",
+ "
teleport
er (315\xb0)"
},
{
},
{
- "mm_
beam
er_16",
- "mm_
beam
er",
- "
beam
er (337.5\xb0)"
+ "mm_
teleport
er_16",
+ "mm_
teleport
er",
+ "
teleport
er (337.5\xb0)"
},
{
"mm_fuse.active",
},
{
"mm_fuse.active",
@@
-5111,104
+5111,104
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"pac man (starts moving down)"
},
{
"pac man (starts moving down)"
},
{
- "mm_polari
sato
r_1",
- "mm_polari
sato
r",
- "polari
sato
r (0\xb0)"
+ "mm_polari
ze
r_1",
+ "mm_polari
ze
r",
+ "polari
ze
r (0\xb0)"
},
{
},
{
- "mm_polari
sato
r_2",
- "mm_polari
sato
r",
- "polari
sato
r (11.25\xb0)"
+ "mm_polari
ze
r_2",
+ "mm_polari
ze
r",
+ "polari
ze
r (11.25\xb0)"
},
{
},
{
- "mm_polari
sato
r_3",
- "mm_polari
sato
r",
- "polari
sato
r (22.5\xb0)"
+ "mm_polari
ze
r_3",
+ "mm_polari
ze
r",
+ "polari
ze
r (22.5\xb0)"
},
{
},
{
- "mm_polari
sato
r_4",
- "mm_polari
sato
r",
- "polari
sato
r (33.75\xb0)"
+ "mm_polari
ze
r_4",
+ "mm_polari
ze
r",
+ "polari
ze
r (33.75\xb0)"
},
{
},
{
- "mm_polari
sato
r_5",
- "mm_polari
sato
r",
- "polari
sato
r (45\xb0)"
+ "mm_polari
ze
r_5",
+ "mm_polari
ze
r",
+ "polari
ze
r (45\xb0)"
},
{
},
{
- "mm_polari
sato
r_6",
- "mm_polari
sato
r",
- "polari
sato
r (56.25\xb0)"
+ "mm_polari
ze
r_6",
+ "mm_polari
ze
r",
+ "polari
ze
r (56.25\xb0)"
},
{
},
{
- "mm_polari
sato
r_7",
- "mm_polari
sato
r",
- "polari
sato
r (67.5\xb0)"
+ "mm_polari
ze
r_7",
+ "mm_polari
ze
r",
+ "polari
ze
r (67.5\xb0)"
},
{
},
{
- "mm_polari
sato
r_8",
- "mm_polari
sato
r",
- "polari
sato
r (78.75\xb0)"
+ "mm_polari
ze
r_8",
+ "mm_polari
ze
r",
+ "polari
ze
r (78.75\xb0)"
},
{
},
{
- "mm_polari
sato
r_9",
- "mm_polari
sato
r",
- "polari
sato
r (90\xb0)"
+ "mm_polari
ze
r_9",
+ "mm_polari
ze
r",
+ "polari
ze
r (90\xb0)"
},
{
},
{
- "mm_polari
sato
r_10",
- "mm_polari
sato
r",
- "polari
sato
r (101.25\xb0)"
+ "mm_polari
ze
r_10",
+ "mm_polari
ze
r",
+ "polari
ze
r (101.25\xb0)"
},
{
},
{
- "mm_polari
sato
r_11",
- "mm_polari
sato
r",
- "polari
sato
r (112.5\xb0)"
+ "mm_polari
ze
r_11",
+ "mm_polari
ze
r",
+ "polari
ze
r (112.5\xb0)"
},
{
},
{
- "mm_polari
sato
r_12",
- "mm_polari
sato
r",
- "polari
sato
r (123.75\xb0)"
+ "mm_polari
ze
r_12",
+ "mm_polari
ze
r",
+ "polari
ze
r (123.75\xb0)"
},
{
},
{
- "mm_polari
sato
r_13",
- "mm_polari
sato
r",
- "polari
sato
r (135\xb0)"
+ "mm_polari
ze
r_13",
+ "mm_polari
ze
r",
+ "polari
ze
r (135\xb0)"
},
{
},
{
- "mm_polari
sato
r_14",
- "mm_polari
sato
r",
- "polari
sato
r (146.25\xb0)"
+ "mm_polari
ze
r_14",
+ "mm_polari
ze
r",
+ "polari
ze
r (146.25\xb0)"
},
{
},
{
- "mm_polari
sato
r_15",
- "mm_polari
sato
r",
- "polari
sato
r (157.5\xb0)"
+ "mm_polari
ze
r_15",
+ "mm_polari
ze
r",
+ "polari
ze
r (157.5\xb0)"
},
{
},
{
- "mm_polari
sato
r_16",
- "mm_polari
sato
r",
- "polari
sato
r (168.75\xb0)"
+ "mm_polari
ze
r_16",
+ "mm_polari
ze
r",
+ "polari
ze
r (168.75\xb0)"
},
{
},
{
- "mm_polari
sato
r_cross_1",
- "mm_polari
sato
r_cross",
- "two-way polari
sato
r (0\xb0)"
+ "mm_polari
ze
r_cross_1",
+ "mm_polari
ze
r_cross",
+ "two-way polari
ze
r (0\xb0)"
},
{
},
{
- "mm_polari
sato
r_cross_2",
- "mm_polari
sato
r_cross",
- "two-way polari
sato
r (22.5\xb0)"
+ "mm_polari
ze
r_cross_2",
+ "mm_polari
ze
r_cross",
+ "two-way polari
ze
r (22.5\xb0)"
},
{
},
{
- "mm_polari
sato
r_cross_3",
- "mm_polari
sato
r_cross",
- "two-way polari
sato
r (45\xb0)"
+ "mm_polari
ze
r_cross_3",
+ "mm_polari
ze
r_cross",
+ "two-way polari
ze
r (45\xb0)"
},
{
},
{
- "mm_polari
sato
r_cross_4",
- "mm_polari
sato
r_cross",
- "two-way polari
sato
r (67.5\xb0)"
+ "mm_polari
ze
r_cross_4",
+ "mm_polari
ze
r_cross",
+ "two-way polari
ze
r (67.5\xb0)"
},
{
"mm_mirror_fixed_1",
},
{
"mm_mirror_fixed_1",
@@
-5248,7
+5248,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
"mm_lightbulb.active",
"mm_lightbulb",
{
"mm_lightbulb.active",
"mm_lightbulb",
- "ligh bulb (on)"
+ "ligh
t
bulb (on)"
},
{
"mm_lightball",
},
{
"mm_lightball",
@@
-5273,22
+5273,22
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
"mm_wooden_grid_fixed_1",
"mm_wooden_grid_fixed",
{
"mm_wooden_grid_fixed_1",
"mm_wooden_grid_fixed",
- "fixed wooden polari
sato
r (0\xb0)"
+ "fixed wooden polari
ze
r (0\xb0)"
},
{
"mm_wooden_grid_fixed_2",
"mm_wooden_grid_fixed",
},
{
"mm_wooden_grid_fixed_2",
"mm_wooden_grid_fixed",
- "fixed wooden polari
sato
r (90\xb0)"
+ "fixed wooden polari
ze
r (90\xb0)"
},
{
"mm_wooden_grid_fixed_3",
"mm_wooden_grid_fixed",
},
{
"mm_wooden_grid_fixed_3",
"mm_wooden_grid_fixed",
- "fixed wooden polari
sato
r (45\xb0)"
+ "fixed wooden polari
ze
r (45\xb0)"
},
{
"mm_wooden_grid_fixed_4",
"mm_wooden_grid_fixed",
},
{
"mm_wooden_grid_fixed_4",
"mm_wooden_grid_fixed",
- "fixed wooden polari
sato
r (135\xb0)"
+ "fixed wooden polari
ze
r (135\xb0)"
},
{
"mm_fuel_empty",
},
{
"mm_fuel_empty",
@@
-5398,82
+5398,82
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
"df_wooden_grid_fixed_1",
"df_wooden_grid_fixed",
{
"df_wooden_grid_fixed_1",
"df_wooden_grid_fixed",
- "fixed wooden polari
sato
r (0\xb0)"
+ "fixed wooden polari
ze
r (0\xb0)"
},
{
"df_wooden_grid_fixed_2",
"df_wooden_grid_fixed",
},
{
"df_wooden_grid_fixed_2",
"df_wooden_grid_fixed",
- "fixed wooden polari
sato
r (22.5\xb0)"
+ "fixed wooden polari
ze
r (22.5\xb0)"
},
{
"df_wooden_grid_fixed_3",
"df_wooden_grid_fixed",
},
{
"df_wooden_grid_fixed_3",
"df_wooden_grid_fixed",
- "fixed wooden polari
sato
r (45\xb0)"
+ "fixed wooden polari
ze
r (45\xb0)"
},
{
"df_wooden_grid_fixed_4",
"df_wooden_grid_fixed",
},
{
"df_wooden_grid_fixed_4",
"df_wooden_grid_fixed",
- "fixed wooden polari
sato
r (67.5\xb0)"
+ "fixed wooden polari
ze
r (67.5\xb0)"
},
{
"df_wooden_grid_fixed_5",
"df_wooden_grid_fixed",
},
{
"df_wooden_grid_fixed_5",
"df_wooden_grid_fixed",
- "fixed wooden polari
sato
r (90\xb0)"
+ "fixed wooden polari
ze
r (90\xb0)"
},
{
"df_wooden_grid_fixed_6",
"df_wooden_grid_fixed",
},
{
"df_wooden_grid_fixed_6",
"df_wooden_grid_fixed",
- "fixed wooden polari
sato
r (112.5\xb0)"
+ "fixed wooden polari
ze
r (112.5\xb0)"
},
{
"df_wooden_grid_fixed_7",
"df_wooden_grid_fixed",
},
{
"df_wooden_grid_fixed_7",
"df_wooden_grid_fixed",
- "fixed wooden polari
sato
r (135\xb0)"
+ "fixed wooden polari
ze
r (135\xb0)"
},
{
"df_wooden_grid_fixed_8",
"df_wooden_grid_fixed",
},
{
"df_wooden_grid_fixed_8",
"df_wooden_grid_fixed",
- "fixed wooden polari
sato
r (157.5\xb0)"
+ "fixed wooden polari
ze
r (157.5\xb0)"
},
{
"df_steel_grid_fixed_1",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_1",
"df_steel_grid_fixed",
- "fixed steel polari
sato
r (0\xb0)"
+ "fixed steel polari
ze
r (0\xb0)"
},
{
"df_steel_grid_fixed_2",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_2",
"df_steel_grid_fixed",
- "fixed steel polari
sato
r (22.5\xb0)"
+ "fixed steel polari
ze
r (22.5\xb0)"
},
{
"df_steel_grid_fixed_3",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_3",
"df_steel_grid_fixed",
- "fixed steel polari
sato
r (45\xb0)"
+ "fixed steel polari
ze
r (45\xb0)"
},
{
"df_steel_grid_fixed_4",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_4",
"df_steel_grid_fixed",
- "fixed steel polari
sato
r (67.5\xb0)"
+ "fixed steel polari
ze
r (67.5\xb0)"
},
{
"df_steel_grid_fixed_5",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_5",
"df_steel_grid_fixed",
- "fixed steel polari
sato
r (90\xb0)"
+ "fixed steel polari
ze
r (90\xb0)"
},
{
"df_steel_grid_fixed_6",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_6",
"df_steel_grid_fixed",
- "fixed steel polari
sato
r (112.5\xb0)"
+ "fixed steel polari
ze
r (112.5\xb0)"
},
{
"df_steel_grid_fixed_7",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_7",
"df_steel_grid_fixed",
- "fixed steel polari
sato
r (135\xb0)"
+ "fixed steel polari
ze
r (135\xb0)"
},
{
"df_steel_grid_fixed_8",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_8",
"df_steel_grid_fixed",
- "fixed steel polari
sato
r (157.5\xb0)"
+ "fixed steel polari
ze
r (157.5\xb0)"
},
{
"df_wooden_wall_1",
},
{
"df_wooden_wall_1",
@@
-5638,7
+5638,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
"df_empty_space",
"empty_space",
{
"df_empty_space",
"empty_space",
- "empty
_
space"
+ "empty
space"
},
{
"df_cell",
},
{
"df_cell",
@@
-5818,402
+5818,402
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
"df_wooden_grid_rotating_1",
"df_wooden_grid_rotating",
{
"df_wooden_grid_rotating_1",
"df_wooden_grid_rotating",
- "rotating wooden polari
sato
r (0\xb0)"
+ "rotating wooden polari
ze
r (0\xb0)"
},
{
"df_wooden_grid_rotating_2",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_2",
"df_wooden_grid_rotating",
- "rotating wooden polari
sato
r (22.5\xb0)"
+ "rotating wooden polari
ze
r (22.5\xb0)"
},
{
"df_wooden_grid_rotating_3",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_3",
"df_wooden_grid_rotating",
- "rotating wooden polari
sato
r (45\xb0)"
+ "rotating wooden polari
ze
r (45\xb0)"
},
{
"df_wooden_grid_rotating_4",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_4",
"df_wooden_grid_rotating",
- "rotating wooden polari
sato
r (67.5\xb0)"
+ "rotating wooden polari
ze
r (67.5\xb0)"
},
{
"df_wooden_grid_rotating_5",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_5",
"df_wooden_grid_rotating",
- "rotating wooden polari
sato
r (90\xb0)"
+ "rotating wooden polari
ze
r (90\xb0)"
},
{
"df_wooden_grid_rotating_6",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_6",
"df_wooden_grid_rotating",
- "rotating wooden polari
sato
r (112.5\xb0)"
+ "rotating wooden polari
ze
r (112.5\xb0)"
},
{
"df_wooden_grid_rotating_7",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_7",
"df_wooden_grid_rotating",
- "rotating wooden polari
sato
r (135\xb0)"
+ "rotating wooden polari
ze
r (135\xb0)"
},
{
"df_wooden_grid_rotating_8",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_8",
"df_wooden_grid_rotating",
- "rotating wooden polari
sato
r (157.5\xb0)"
+ "rotating wooden polari
ze
r (157.5\xb0)"
},
{
"df_steel_grid_rotating_1",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_1",
"df_steel_grid_rotating",
- "rotating steel polari
sato
r (0\xb0)"
+ "rotating steel polari
ze
r (0\xb0)"
},
{
"df_steel_grid_rotating_2",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_2",
"df_steel_grid_rotating",
- "rotating steel polari
sato
r (22.5\xb0)"
+ "rotating steel polari
ze
r (22.5\xb0)"
},
{
"df_steel_grid_rotating_3",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_3",
"df_steel_grid_rotating",
- "rotating steel polari
sato
r (45\xb0)"
+ "rotating steel polari
ze
r (45\xb0)"
},
{
"df_steel_grid_rotating_4",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_4",
"df_steel_grid_rotating",
- "rotating steel polari
sato
r (67.5\xb0)"
+ "rotating steel polari
ze
r (67.5\xb0)"
},
{
"df_steel_grid_rotating_5",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_5",
"df_steel_grid_rotating",
- "rotating steel polari
sato
r (90\xb0)"
+ "rotating steel polari
ze
r (90\xb0)"
},
{
"df_steel_grid_rotating_6",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_6",
"df_steel_grid_rotating",
- "rotating steel polari
sato
r (112.5\xb0)"
+ "rotating steel polari
ze
r (112.5\xb0)"
},
{
"df_steel_grid_rotating_7",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_7",
"df_steel_grid_rotating",
- "rotating steel polari
sato
r (135\xb0)"
+ "rotating steel polari
ze
r (135\xb0)"
},
{
"df_steel_grid_rotating_8",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_8",
"df_steel_grid_rotating",
- "rotating steel polari
sato
r (157.5\xb0)"
+ "rotating steel polari
ze
r (157.5\xb0)"
},
{
},
{
- "mm_
beam
er_red_1",
- "mm_
beam
er",
- "red
beam
er (0\xb0)"
+ "mm_
teleport
er_red_1",
+ "mm_
teleport
er",
+ "red
teleport
er (0\xb0)"
},
{
},
{
- "mm_
beam
er_red_2",
- "mm_
beam
er",
- "red
beam
er (22.5\xb0)"
+ "mm_
teleport
er_red_2",
+ "mm_
teleport
er",
+ "red
teleport
er (22.5\xb0)"
},
{
},
{
- "mm_
beam
er_red_3",
- "mm_
beam
er",
- "red
beam
er (45\xb0)"
+ "mm_
teleport
er_red_3",
+ "mm_
teleport
er",
+ "red
teleport
er (45\xb0)"
},
{
},
{
- "mm_
beam
er_red_4",
- "mm_
beam
er",
- "red
beam
er (67.5\xb0)"
+ "mm_
teleport
er_red_4",
+ "mm_
teleport
er",
+ "red
teleport
er (67.5\xb0)"
},
{
},
{
- "mm_
beam
er_red_5",
- "mm_
beam
er",
- "red
beam
er (90\xb0)"
+ "mm_
teleport
er_red_5",
+ "mm_
teleport
er",
+ "red
teleport
er (90\xb0)"
},
{
},
{
- "mm_
beam
er_red_6",
- "mm_
beam
er",
- "red
beam
er (112.5\xb0)"
+ "mm_
teleport
er_red_6",
+ "mm_
teleport
er",
+ "red
teleport
er (112.5\xb0)"
},
{
},
{
- "mm_
beam
er_red_7",
- "mm_
beam
er",
- "red
beam
er (135\xb0)"
+ "mm_
teleport
er_red_7",
+ "mm_
teleport
er",
+ "red
teleport
er (135\xb0)"
},
{
},
{
- "mm_
beam
er_red_8",
- "mm_
beam
er",
- "red
beam
er (157.5\xb0)"
+ "mm_
teleport
er_red_8",
+ "mm_
teleport
er",
+ "red
teleport
er (157.5\xb0)"
},
{
},
{
- "mm_
beam
er_red_9",
- "mm_
beam
er",
- "red
beam
er (180\xb0)"
+ "mm_
teleport
er_red_9",
+ "mm_
teleport
er",
+ "red
teleport
er (180\xb0)"
},
{
},
{
- "mm_
beam
er_red_10",
- "mm_
beam
er",
- "red
beam
er (202.5\xb0)"
+ "mm_
teleport
er_red_10",
+ "mm_
teleport
er",
+ "red
teleport
er (202.5\xb0)"
},
{
},
{
- "mm_
beam
er_red_11",
- "mm_
beam
er",
- "red
beam
er (225\xb0)"
+ "mm_
teleport
er_red_11",
+ "mm_
teleport
er",
+ "red
teleport
er (225\xb0)"
},
{
},
{
- "mm_
beam
er_red_12",
- "mm_
beam
er",
- "red
beam
er (247.5\xb0)"
+ "mm_
teleport
er_red_12",
+ "mm_
teleport
er",
+ "red
teleport
er (247.5\xb0)"
},
{
},
{
- "mm_
beam
er_red_13",
- "mm_
beam
er",
- "red
beam
er (270\xb0)"
+ "mm_
teleport
er_red_13",
+ "mm_
teleport
er",
+ "red
teleport
er (270\xb0)"
},
{
},
{
- "mm_
beam
er_red_14",
- "mm_
beam
er",
- "red
beam
er (292.5\xb0)"
+ "mm_
teleport
er_red_14",
+ "mm_
teleport
er",
+ "red
teleport
er (292.5\xb0)"
},
{
},
{
- "mm_
beam
er_red_15",
- "mm_
beam
er",
- "red
beam
er (315\xb0)"
+ "mm_
teleport
er_red_15",
+ "mm_
teleport
er",
+ "red
teleport
er (315\xb0)"
},
{
},
{
- "mm_
beam
er_red_16",
- "mm_
beam
er",
- "red
beam
er (337.5\xb0)"
+ "mm_
teleport
er_red_16",
+ "mm_
teleport
er",
+ "red
teleport
er (337.5\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_1",
- "mm_
beam
er",
- "yellow
beam
er (0\xb0)"
+ "mm_
teleport
er_yellow_1",
+ "mm_
teleport
er",
+ "yellow
teleport
er (0\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_2",
- "mm_
beam
er",
- "yellow
beam
er (22.5\xb0)"
+ "mm_
teleport
er_yellow_2",
+ "mm_
teleport
er",
+ "yellow
teleport
er (22.5\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_3",
- "mm_
beam
er",
- "yellow
beam
er (45\xb0)"
+ "mm_
teleport
er_yellow_3",
+ "mm_
teleport
er",
+ "yellow
teleport
er (45\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_4",
- "mm_
beam
er",
- "yellow
beam
er (67.5\xb0)"
+ "mm_
teleport
er_yellow_4",
+ "mm_
teleport
er",
+ "yellow
teleport
er (67.5\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_5",
- "mm_
beam
er",
- "yellow
beam
er (90\xb0)"
+ "mm_
teleport
er_yellow_5",
+ "mm_
teleport
er",
+ "yellow
teleport
er (90\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_6",
- "mm_
beam
er",
- "yellow
beam
er (112.5\xb0)"
+ "mm_
teleport
er_yellow_6",
+ "mm_
teleport
er",
+ "yellow
teleport
er (112.5\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_7",
- "mm_
beam
er",
- "yellow
beam
er (135\xb0)"
+ "mm_
teleport
er_yellow_7",
+ "mm_
teleport
er",
+ "yellow
teleport
er (135\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_8",
- "mm_
beam
er",
- "yellow
beam
er (157.5\xb0)"
+ "mm_
teleport
er_yellow_8",
+ "mm_
teleport
er",
+ "yellow
teleport
er (157.5\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_9",
- "mm_
beam
er",
- "yellow
beam
er (180\xb0)"
+ "mm_
teleport
er_yellow_9",
+ "mm_
teleport
er",
+ "yellow
teleport
er (180\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_10",
- "mm_
beam
er",
- "yellow
beam
er (202.5\xb0)"
+ "mm_
teleport
er_yellow_10",
+ "mm_
teleport
er",
+ "yellow
teleport
er (202.5\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_11",
- "mm_
beam
er",
- "yellow
beam
er (225\xb0)"
+ "mm_
teleport
er_yellow_11",
+ "mm_
teleport
er",
+ "yellow
teleport
er (225\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_12",
- "mm_
beam
er",
- "yellow
beam
er (247.5\xb0)"
+ "mm_
teleport
er_yellow_12",
+ "mm_
teleport
er",
+ "yellow
teleport
er (247.5\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_13",
- "mm_
beam
er",
- "yellow
beam
er (270\xb0)"
+ "mm_
teleport
er_yellow_13",
+ "mm_
teleport
er",
+ "yellow
teleport
er (270\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_14",
- "mm_
beam
er",
- "yellow
beam
er (292.5\xb0)"
+ "mm_
teleport
er_yellow_14",
+ "mm_
teleport
er",
+ "yellow
teleport
er (292.5\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_15",
- "mm_
beam
er",
- "yellow
beam
er (315\xb0)"
+ "mm_
teleport
er_yellow_15",
+ "mm_
teleport
er",
+ "yellow
teleport
er (315\xb0)"
},
{
},
{
- "mm_
beam
er_yellow_16",
- "mm_
beam
er",
- "yellow
beam
er (337.5\xb0)"
+ "mm_
teleport
er_yellow_16",
+ "mm_
teleport
er",
+ "yellow
teleport
er (337.5\xb0)"
},
{
},
{
- "mm_
beam
er_green_1",
- "mm_
beam
er",
- "green
beam
er (0\xb0)"
+ "mm_
teleport
er_green_1",
+ "mm_
teleport
er",
+ "green
teleport
er (0\xb0)"
},
{
},
{
- "mm_
beam
er_green_2",
- "mm_
beam
er",
- "green
beam
er (22.5\xb0)"
+ "mm_
teleport
er_green_2",
+ "mm_
teleport
er",
+ "green
teleport
er (22.5\xb0)"
},
{
},
{
- "mm_
beam
er_green_3",
- "mm_
beam
er",
- "green
beam
er (45\xb0)"
+ "mm_
teleport
er_green_3",
+ "mm_
teleport
er",
+ "green
teleport
er (45\xb0)"
},
{
},
{
- "mm_
beam
er_green_4",
- "mm_
beam
er",
- "green
beam
er (67.5\xb0)"
+ "mm_
teleport
er_green_4",
+ "mm_
teleport
er",
+ "green
teleport
er (67.5\xb0)"
},
{
},
{
- "mm_
beam
er_green_5",
- "mm_
beam
er",
- "green
beam
er (90\xb0)"
+ "mm_
teleport
er_green_5",
+ "mm_
teleport
er",
+ "green
teleport
er (90\xb0)"
},
{
},
{
- "mm_
beam
er_green_6",
- "mm_
beam
er",
- "green
beam
er (112.5\xb0)"
+ "mm_
teleport
er_green_6",
+ "mm_
teleport
er",
+ "green
teleport
er (112.5\xb0)"
},
{
},
{
- "mm_
beam
er_green_7",
- "mm_
beam
er",
- "green
beam
er (135\xb0)"
+ "mm_
teleport
er_green_7",
+ "mm_
teleport
er",
+ "green
teleport
er (135\xb0)"
},
{
},
{
- "mm_
beam
er_green_8",
- "mm_
beam
er",
- "green
beam
er (157.5\xb0)"
+ "mm_
teleport
er_green_8",
+ "mm_
teleport
er",
+ "green
teleport
er (157.5\xb0)"
},
{
},
{
- "mm_
beam
er_green_9",
- "mm_
beam
er",
- "green
beam
er (180\xb0)"
+ "mm_
teleport
er_green_9",
+ "mm_
teleport
er",
+ "green
teleport
er (180\xb0)"
},
{
},
{
- "mm_
beam
er_green_10",
- "mm_
beam
er",
- "green
beam
er (202.5\xb0)"
+ "mm_
teleport
er_green_10",
+ "mm_
teleport
er",
+ "green
teleport
er (202.5\xb0)"
},
{
},
{
- "mm_
beam
er_green_11",
- "mm_
beam
er",
- "green
beam
er (225\xb0)"
+ "mm_
teleport
er_green_11",
+ "mm_
teleport
er",
+ "green
teleport
er (225\xb0)"
},
{
},
{
- "mm_
beam
er_green_12",
- "mm_
beam
er",
- "green
beam
er (247.5\xb0)"
+ "mm_
teleport
er_green_12",
+ "mm_
teleport
er",
+ "green
teleport
er (247.5\xb0)"
},
{
},
{
- "mm_
beam
er_green_13",
- "mm_
beam
er",
- "green
beam
er (270\xb0)"
+ "mm_
teleport
er_green_13",
+ "mm_
teleport
er",
+ "green
teleport
er (270\xb0)"
},
{
},
{
- "mm_
beam
er_green_14",
- "mm_
beam
er",
- "green
beam
er (292.5\xb0)"
+ "mm_
teleport
er_green_14",
+ "mm_
teleport
er",
+ "green
teleport
er (292.5\xb0)"
},
{
},
{
- "mm_
beam
er_green_15",
- "mm_
beam
er",
- "green
beam
er (315\xb0)"
+ "mm_
teleport
er_green_15",
+ "mm_
teleport
er",
+ "green
teleport
er (315\xb0)"
},
{
},
{
- "mm_
beam
er_green_16",
- "mm_
beam
er",
- "green
beam
er (337.5\xb0)"
+ "mm_
teleport
er_green_16",
+ "mm_
teleport
er",
+ "green
teleport
er (337.5\xb0)"
},
{
},
{
- "mm_
beam
er_blue_1",
- "mm_
beam
er",
- "blue
beam
er (0\xb0)"
+ "mm_
teleport
er_blue_1",
+ "mm_
teleport
er",
+ "blue
teleport
er (0\xb0)"
},
{
},
{
- "mm_
beam
er_blue_2",
- "mm_
beam
er",
- "blue
beam
er (22.5\xb0)"
+ "mm_
teleport
er_blue_2",
+ "mm_
teleport
er",
+ "blue
teleport
er (22.5\xb0)"
},
{
},
{
- "mm_
beam
er_blue_3",
- "mm_
beam
er",
- "blue
beam
er (45\xb0)"
+ "mm_
teleport
er_blue_3",
+ "mm_
teleport
er",
+ "blue
teleport
er (45\xb0)"
},
{
},
{
- "mm_
beam
er_blue_4",
- "mm_
beam
er",
- "blue
beam
er (67.5\xb0)"
+ "mm_
teleport
er_blue_4",
+ "mm_
teleport
er",
+ "blue
teleport
er (67.5\xb0)"
},
{
},
{
- "mm_
beam
er_blue_5",
- "mm_
beam
er",
- "blue
beam
er (90\xb0)"
+ "mm_
teleport
er_blue_5",
+ "mm_
teleport
er",
+ "blue
teleport
er (90\xb0)"
},
{
},
{
- "mm_
beam
er_blue_6",
- "mm_
beam
er",
- "blue
beam
er (112.5\xb0)"
+ "mm_
teleport
er_blue_6",
+ "mm_
teleport
er",
+ "blue
teleport
er (112.5\xb0)"
},
{
},
{
- "mm_
beam
er_blue_7",
- "mm_
beam
er",
- "blue
beam
er (135\xb0)"
+ "mm_
teleport
er_blue_7",
+ "mm_
teleport
er",
+ "blue
teleport
er (135\xb0)"
},
{
},
{
- "mm_
beam
er_blue_8",
- "mm_
beam
er",
- "blue
beam
er (157.5\xb0)"
+ "mm_
teleport
er_blue_8",
+ "mm_
teleport
er",
+ "blue
teleport
er (157.5\xb0)"
},
{
},
{
- "mm_
beam
er_blue_9",
- "mm_
beam
er",
- "blue
beam
er (180\xb0)"
+ "mm_
teleport
er_blue_9",
+ "mm_
teleport
er",
+ "blue
teleport
er (180\xb0)"
},
{
},
{
- "mm_
beam
er_blue_10",
- "mm_
beam
er",
- "blue
beam
er (202.5\xb0)"
+ "mm_
teleport
er_blue_10",
+ "mm_
teleport
er",
+ "blue
teleport
er (202.5\xb0)"
},
{
},
{
- "mm_
beam
er_blue_11",
- "mm_
beam
er",
- "blue
beam
er (225\xb0)"
+ "mm_
teleport
er_blue_11",
+ "mm_
teleport
er",
+ "blue
teleport
er (225\xb0)"
},
{
},
{
- "mm_
beam
er_blue_12",
- "mm_
beam
er",
- "blue
beam
er (247.5\xb0)"
+ "mm_
teleport
er_blue_12",
+ "mm_
teleport
er",
+ "blue
teleport
er (247.5\xb0)"
},
{
},
{
- "mm_
beam
er_blue_13",
- "mm_
beam
er",
- "blue
beam
er (270\xb0)"
+ "mm_
teleport
er_blue_13",
+ "mm_
teleport
er",
+ "blue
teleport
er (270\xb0)"
},
{
},
{
- "mm_
beam
er_blue_14",
- "mm_
beam
er",
- "blue
beam
er (292.5\xb0)"
+ "mm_
teleport
er_blue_14",
+ "mm_
teleport
er",
+ "blue
teleport
er (292.5\xb0)"
},
{
},
{
- "mm_
beam
er_blue_15",
- "mm_
beam
er",
- "blue
beam
er (315\xb0)"
+ "mm_
teleport
er_blue_15",
+ "mm_
teleport
er",
+ "blue
teleport
er (315\xb0)"
},
{
},
{
- "mm_
beam
er_blue_16",
- "mm_
beam
er",
- "blue
beam
er (337.5\xb0)"
+ "mm_
teleport
er_blue_16",
+ "mm_
teleport
er",
+ "blue
teleport
er (337.5\xb0)"
},
{
"mm_mcduffin",
},
{
"mm_mcduffin",
@@
-6271,9
+6271,9
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"wooden wall (DF style)",
},
"wooden wall (DF style)",
},
- /
* ----------------------------------------------------------------------- */
- /
* "real" (and therefore drawable) runtime elements */
- /
* ----------------------------------------------------------------------- */
+ /
/ --------------------------------------------------------------------------
+ /
/ "real" (and therefore drawable) runtime elements
+ /
/ --------------------------------------------------------------------------
{
"dynabomb_player_1.active",
{
"dynabomb_player_1.active",
@@
-6682,9
+6682,9
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"pac man (eating down)"
},
"pac man (eating down)"
},
- /
* ----------------------------------------------------------------------- */
- /
* "unreal" (and therefore not drawable) runtime elements */
- /
* ----------------------------------------------------------------------- */
+ /
/ --------------------------------------------------------------------------
+ /
/ "unreal" (and therefore not drawable) runtime elements
+ /
/ --------------------------------------------------------------------------
{
"blocked",
{
"blocked",
@@
-6807,9
+6807,9
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"-"
},
"-"
},
- /
* ----------------------------------------------------------------------- */
- /
* dummy elements (never used as game elements, only used as graphics) */
- /
* ----------------------------------------------------------------------- */
+ /
/ --------------------------------------------------------------------------
+ /
/ dummy elements (never used as game elements, only used as graphics)
+ /
/ --------------------------------------------------------------------------
{
"steelwall_topleft",
{
"steelwall_topleft",
@@
-7237,7
+7237,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"hide elements used in this level"
},
"hide elements used in this level"
},
- /
* keyword to stop parser: "ELEMENT_INFO_END" <-- do not change! */
+ /
/ keyword to stop parser: "ELEMENT_INFO_END" <-- do not change!
{
NULL,
{
NULL,
@@
-7247,9
+7247,9
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
};
};
-/
* ------------------------------------------------------------------------- */
-/
* element action and direction definitions */
-/
* ------------------------------------------------------------------------- */
+/
/ ----------------------------------------------------------------------------
+/
/ element action and direction definitions
+/
/ ----------------------------------------------------------------------------
struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
{
struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
{
@@
-7372,7
+7372,7
@@
struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
{ ".part_32", ACTION_PART_32, FALSE },
{ ".other", ACTION_OTHER, FALSE },
{ ".part_32", ACTION_PART_32, FALSE },
{ ".other", ACTION_OTHER, FALSE },
- /
* empty suffix always matches -- check as last entry in InitSoundInfo() */
+ /
/ empty suffix always matches -- check as last entry in InitSoundInfo()
{ "", ACTION_DEFAULT, TRUE },
{ NULL, 0, 0 }
{ "", ACTION_DEFAULT, TRUE },
{ NULL, 0, 0 }
@@
-7431,22
+7431,22
@@
struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
{ ".FADING", GFX_SPECIAL_ARG_FADING, },
{ ".QUIT", GFX_SPECIAL_ARG_QUIT, },
{ ".FADING", GFX_SPECIAL_ARG_FADING, },
{ ".QUIT", GFX_SPECIAL_ARG_QUIT, },
- /
* empty suffix always matches -- check as last entry in InitMusicInfo() */
+ /
/ empty suffix always matches -- check as last entry in InitMusicInfo()
{ "", GFX_SPECIAL_ARG_DEFAULT, },
{ NULL, 0, }
};
{ "", GFX_SPECIAL_ARG_DEFAULT, },
{ NULL, 0, }
};
-#include "conf_var.c" /
* include auto-generated data structure definitions */
+#include "conf_var.c" /
/ include auto-generated data structure definitions
-/
* ------------------------------------------------------------------------- */
-/
* font definitions */
-/
* ------------------------------------------------------------------------- */
+/
/ ----------------------------------------------------------------------------
+/
/ font definitions
+/
/ ----------------------------------------------------------------------------
-/
*
Important: When one entry is a prefix of another entry, the longer entry
-
must come first, because the dynamic configuration does prefix matching!
- (These definitions must match the corresponding definitions in "main.h"!) */
+/
/
Important: When one entry is a prefix of another entry, the longer entry
+
//
must come first, because the dynamic configuration does prefix matching!
+// (These definitions must match the corresponding definitions in "main.h"!)
struct FontInfo font_info[NUM_FONTS + 1] =
{
struct FontInfo font_info[NUM_FONTS + 1] =
{
@@
-7483,6
+7483,7
@@
struct FontInfo font_info[NUM_FONTS + 1] =
{ "font.option_on" },
{ "font.value_1" },
{ "font.value_2" },
{ "font.option_on" },
{ "font.value_1" },
{ "font.value_2" },
+ { "font.value_old_narrow" },
{ "font.value_old" },
{ "font.value_narrow" },
{ "font.level_number.active" },
{ "font.value_old" },
{ "font.value_narrow" },
{ "font.level_number.active" },
@@
-7491,16
+7492,17
@@
struct FontInfo font_info[NUM_FONTS + 1] =
{ "font.game_info" },
{ "font.info.elements" },
{ "font.info.levelset" },
{ "font.game_info" },
{ "font.info.elements" },
{ "font.info.levelset" },
+ { "font.main.network_players" },
{ NULL }
};
struct GlobalAnimInfo global_anim_info[NUM_GLOBAL_ANIM_TOKENS + 1];
{ NULL }
};
struct GlobalAnimInfo global_anim_info[NUM_GLOBAL_ANIM_TOKENS + 1];
-/
* this contains predefined structure elements to init "global_anim_info" */
+/
/ this contains predefined structure elements to init "global_anim_info"
struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] =
{
struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] =
{
- /
* (real) graphic definitions used to define animation graphics */
+ /
/ (real) graphic definitions used to define animation graphics
{ "gfx.global.anim_1", },
{ "gfx.global.anim_2", },
{ "gfx.global.anim_3", },
{ "gfx.global.anim_1", },
{ "gfx.global.anim_2", },
{ "gfx.global.anim_3", },
@@
-7534,7
+7536,7
@@
struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] =
{ "gfx.global.anim_31", },
{ "gfx.global.anim_32", },
{ "gfx.global.anim_31", },
{ "gfx.global.anim_32", },
- /
* (dummy) graphic definitions used to define animation controls */
+ /
/ (dummy) graphic definitions used to define animation controls
{ "global.anim_1", },
{ "global.anim_2", },
{ "global.anim_3", },
{ "global.anim_1", },
{ "global.anim_2", },
{ "global.anim_3", },
@@
-7572,9
+7574,9
@@
struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] =
};
};
-/
* ------------------------------------------------------------------------- */
-/
* music token prefix definitions */
-/
* ------------------------------------------------------------------------- */
+/
/ ----------------------------------------------------------------------------
+/
/ music token prefix definitions
+/
/ ----------------------------------------------------------------------------
struct MusicPrefixInfo music_prefix_info[NUM_MUSIC_PREFIXES + 1] =
{
struct MusicPrefixInfo music_prefix_info[NUM_MUSIC_PREFIXES + 1] =
{
@@
-7584,11
+7586,11
@@
struct MusicPrefixInfo music_prefix_info[NUM_MUSIC_PREFIXES + 1] =
};
};
-/
* ========================================================================= */
-/
* main() */
-/
* ========================================================================= */
+/
/ ============================================================================
+/
/ main()
+/
/ ============================================================================
-static void print_usage()
+static void print_usage(
void
)
{
Print("\n"
"Usage: %s [OPTION]... [HOSTNAME [PORT]]\n"
{
Print("\n"
"Usage: %s [OPTION]... [HOSTNAME [PORT]]\n"
@@
-7627,7
+7629,7
@@
static void print_usage()
program.command_basename);
}
program.command_basename);
}
-static void print_version()
+static void print_version(
void
)
{
Print("%s", getProgramInitString());
{
Print("%s", getProgramInitString());
@@
-7635,10
+7637,10
@@
static void print_version()
{
Print(" (%s %d.%d.%d.%d%s)",
PROGRAM_TITLE_STRING,
{
Print(" (%s %d.%d.%d.%d%s)",
PROGRAM_TITLE_STRING,
+ PROGRAM_VERSION_SUPER,
PROGRAM_VERSION_MAJOR,
PROGRAM_VERSION_MINOR,
PROGRAM_VERSION_PATCH,
PROGRAM_VERSION_MAJOR,
PROGRAM_VERSION_MINOR,
PROGRAM_VERSION_PATCH,
- PROGRAM_VERSION_BUILD,
PROGRAM_VERSION_EXTRA);
}
PROGRAM_VERSION_EXTRA);
}
@@
-7760,5
+7762,5
@@
int main(int argc, char *argv[])
EventLoop();
CloseAllAndExit(0);
EventLoop();
CloseAllAndExit(0);
- return 0; /
* to keep compilers happy */
+ return 0; /
/ to keep compilers happy
}
}