X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.c;h=59faa000e1ccb64b15051c6a1dc8cd2ee5fa7f12;hp=146f060c66622f42077008e9a69047861f6207b7;hb=20e9d89a234989e55d9d232b6e5ba5a81342ced6;hpb=40aa8a64f516da6baf703b44d141b37c291553df diff --git a/src/main.c b/src/main.c index 146f060c..59faa000 100644 --- a/src/main.c +++ b/src/main.c @@ -33,15 +33,13 @@ int game_status = -1; boolean game_status_last_screen = -1; boolean level_editor_test_game = FALSE; boolean network_playing = FALSE; - -#if defined(TARGET_SDL) boolean network_server = FALSE; SDL_Thread *server_thread; -#endif 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]; @@ -125,15 +123,11 @@ int BX1, BY1; int BX2, BY2; int SBX_Left, SBX_Right; int SBY_Upper, SBY_Lower; -int ZX, ZY; -int ExitX, ExitY; -int AllPlayersGone; int TimeFrames, TimePlayed, TimeLeft, TapeTime; 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]; @@ -186,20 +180,20 @@ SetupFileHash *font_token_hash = NULL; SetupFileHash *hide_setup_hash = NULL; -/* ------------------------------------------------------------------------- */ -/* element definitions */ -/* ------------------------------------------------------------------------- */ +// ---------------------------------------------------------------------------- +// element definitions +// ---------------------------------------------------------------------------- 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] = { - /* 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", @@ -1181,17 +1175,17 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "letter ''" }, { - "char_unused", + "char_button", "char", "letter 'button'" }, { - "char_unused", + "char_up", "char", "letter 'up'" }, { - "char_unused", + "char_down", "char", "letter 'down'" }, @@ -4241,17 +4235,17 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "steel letter ''" }, { - "steel_char_unused", + "steel_char_button", "steel_char", "steel letter 'button'" }, { - "steel_char_unused", + "steel_char_up", "steel_char", "steel letter 'up'" }, { - "steel_char_unused", + "steel_char_down", "steel_char", "steel letter 'down'" }, @@ -5006,84 +5000,84 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "gray ball" }, { - "mm_beamer_1", - "mm_beamer", - "beamer (0\xb0)" + "mm_teleporter_1", + "mm_teleporter", + "teleporter (0\xb0)" }, { - "mm_beamer_2", - "mm_beamer", - "beamer (22.5\xb0)" + "mm_teleporter_2", + "mm_teleporter", + "teleporter (22.5\xb0)" }, { - "mm_beamer_3", - "mm_beamer", - "beamer (45\xb0)" + "mm_teleporter_3", + "mm_teleporter", + "teleporter (45\xb0)" }, { - "mm_beamer_4", - "mm_beamer", - "beamer (67.5\xb0)" + "mm_teleporter_4", + "mm_teleporter", + "teleporter (67.5\xb0)" }, { - "mm_beamer_5", - "mm_beamer", - "beamer (90\xb0)" + "mm_teleporter_5", + "mm_teleporter", + "teleporter (90\xb0)" }, { - "mm_beamer_6", - "mm_beamer", - "beamer (112.5\xb0)" + "mm_teleporter_6", + "mm_teleporter", + "teleporter (112.5\xb0)" }, { - "mm_beamer_7", - "mm_beamer", - "beamer (135\xb0)" + "mm_teleporter_7", + "mm_teleporter", + "teleporter (135\xb0)" }, { - "mm_beamer_8", - "mm_beamer", - "beamer (157.5\xb0)" + "mm_teleporter_8", + "mm_teleporter", + "teleporter (157.5\xb0)" }, { - "mm_beamer_9", - "mm_beamer", - "beamer (180\xb0)" + "mm_teleporter_9", + "mm_teleporter", + "teleporter (180\xb0)" }, { - "mm_beamer_10", - "mm_beamer", - "beamer (202.5\xb0)" + "mm_teleporter_10", + "mm_teleporter", + "teleporter (202.5\xb0)" }, { - "mm_beamer_11", - "mm_beamer", - "beamer (225\xb0)" + "mm_teleporter_11", + "mm_teleporter", + "teleporter (225\xb0)" }, { - "mm_beamer_12", - "mm_beamer", - "beamer (247.5\xb0)" + "mm_teleporter_12", + "mm_teleporter", + "teleporter (247.5\xb0)" }, { - "mm_beamer_13", - "mm_beamer", - "beamer (270\xb0)" + "mm_teleporter_13", + "mm_teleporter", + "teleporter (270\xb0)" }, { - "mm_beamer_14", - "mm_beamer", - "beamer (292.5\xb0)" + "mm_teleporter_14", + "mm_teleporter", + "teleporter (292.5\xb0)" }, { - "mm_beamer_15", - "mm_beamer", - "beamer (315\xb0)" + "mm_teleporter_15", + "mm_teleporter", + "teleporter (315\xb0)" }, { - "mm_beamer_16", - "mm_beamer", - "beamer (337.5\xb0)" + "mm_teleporter_16", + "mm_teleporter", + "teleporter (337.5\xb0)" }, { "mm_fuse.active", @@ -5248,7 +5242,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = { "mm_lightbulb.active", "mm_lightbulb", - "ligh bulb (on)" + "light bulb (on)" }, { "mm_lightball", @@ -5638,7 +5632,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = { "df_empty_space", "empty_space", - "empty_space" + "empty space" }, { "df_cell", @@ -5896,324 +5890,324 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "rotating steel polarizer (157.5\xb0)" }, { - "mm_beamer_red_1", - "mm_beamer", - "red beamer (0\xb0)" + "mm_teleporter_red_1", + "mm_teleporter", + "red teleporter (0\xb0)" }, { - "mm_beamer_red_2", - "mm_beamer", - "red beamer (22.5\xb0)" + "mm_teleporter_red_2", + "mm_teleporter", + "red teleporter (22.5\xb0)" }, { - "mm_beamer_red_3", - "mm_beamer", - "red beamer (45\xb0)" + "mm_teleporter_red_3", + "mm_teleporter", + "red teleporter (45\xb0)" }, { - "mm_beamer_red_4", - "mm_beamer", - "red beamer (67.5\xb0)" + "mm_teleporter_red_4", + "mm_teleporter", + "red teleporter (67.5\xb0)" }, { - "mm_beamer_red_5", - "mm_beamer", - "red beamer (90\xb0)" + "mm_teleporter_red_5", + "mm_teleporter", + "red teleporter (90\xb0)" }, { - "mm_beamer_red_6", - "mm_beamer", - "red beamer (112.5\xb0)" + "mm_teleporter_red_6", + "mm_teleporter", + "red teleporter (112.5\xb0)" }, { - "mm_beamer_red_7", - "mm_beamer", - "red beamer (135\xb0)" + "mm_teleporter_red_7", + "mm_teleporter", + "red teleporter (135\xb0)" }, { - "mm_beamer_red_8", - "mm_beamer", - "red beamer (157.5\xb0)" + "mm_teleporter_red_8", + "mm_teleporter", + "red teleporter (157.5\xb0)" }, { - "mm_beamer_red_9", - "mm_beamer", - "red beamer (180\xb0)" + "mm_teleporter_red_9", + "mm_teleporter", + "red teleporter (180\xb0)" }, { - "mm_beamer_red_10", - "mm_beamer", - "red beamer (202.5\xb0)" + "mm_teleporter_red_10", + "mm_teleporter", + "red teleporter (202.5\xb0)" }, { - "mm_beamer_red_11", - "mm_beamer", - "red beamer (225\xb0)" + "mm_teleporter_red_11", + "mm_teleporter", + "red teleporter (225\xb0)" }, { - "mm_beamer_red_12", - "mm_beamer", - "red beamer (247.5\xb0)" + "mm_teleporter_red_12", + "mm_teleporter", + "red teleporter (247.5\xb0)" }, { - "mm_beamer_red_13", - "mm_beamer", - "red beamer (270\xb0)" + "mm_teleporter_red_13", + "mm_teleporter", + "red teleporter (270\xb0)" }, { - "mm_beamer_red_14", - "mm_beamer", - "red beamer (292.5\xb0)" + "mm_teleporter_red_14", + "mm_teleporter", + "red teleporter (292.5\xb0)" }, { - "mm_beamer_red_15", - "mm_beamer", - "red beamer (315\xb0)" + "mm_teleporter_red_15", + "mm_teleporter", + "red teleporter (315\xb0)" }, { - "mm_beamer_red_16", - "mm_beamer", - "red beamer (337.5\xb0)" + "mm_teleporter_red_16", + "mm_teleporter", + "red teleporter (337.5\xb0)" }, { - "mm_beamer_yellow_1", - "mm_beamer", - "yellow beamer (0\xb0)" + "mm_teleporter_yellow_1", + "mm_teleporter", + "yellow teleporter (0\xb0)" }, { - "mm_beamer_yellow_2", - "mm_beamer", - "yellow beamer (22.5\xb0)" + "mm_teleporter_yellow_2", + "mm_teleporter", + "yellow teleporter (22.5\xb0)" }, { - "mm_beamer_yellow_3", - "mm_beamer", - "yellow beamer (45\xb0)" + "mm_teleporter_yellow_3", + "mm_teleporter", + "yellow teleporter (45\xb0)" }, { - "mm_beamer_yellow_4", - "mm_beamer", - "yellow beamer (67.5\xb0)" + "mm_teleporter_yellow_4", + "mm_teleporter", + "yellow teleporter (67.5\xb0)" }, { - "mm_beamer_yellow_5", - "mm_beamer", - "yellow beamer (90\xb0)" + "mm_teleporter_yellow_5", + "mm_teleporter", + "yellow teleporter (90\xb0)" }, { - "mm_beamer_yellow_6", - "mm_beamer", - "yellow beamer (112.5\xb0)" + "mm_teleporter_yellow_6", + "mm_teleporter", + "yellow teleporter (112.5\xb0)" }, { - "mm_beamer_yellow_7", - "mm_beamer", - "yellow beamer (135\xb0)" + "mm_teleporter_yellow_7", + "mm_teleporter", + "yellow teleporter (135\xb0)" }, { - "mm_beamer_yellow_8", - "mm_beamer", - "yellow beamer (157.5\xb0)" + "mm_teleporter_yellow_8", + "mm_teleporter", + "yellow teleporter (157.5\xb0)" }, { - "mm_beamer_yellow_9", - "mm_beamer", - "yellow beamer (180\xb0)" + "mm_teleporter_yellow_9", + "mm_teleporter", + "yellow teleporter (180\xb0)" }, { - "mm_beamer_yellow_10", - "mm_beamer", - "yellow beamer (202.5\xb0)" + "mm_teleporter_yellow_10", + "mm_teleporter", + "yellow teleporter (202.5\xb0)" }, { - "mm_beamer_yellow_11", - "mm_beamer", - "yellow beamer (225\xb0)" + "mm_teleporter_yellow_11", + "mm_teleporter", + "yellow teleporter (225\xb0)" }, { - "mm_beamer_yellow_12", - "mm_beamer", - "yellow beamer (247.5\xb0)" + "mm_teleporter_yellow_12", + "mm_teleporter", + "yellow teleporter (247.5\xb0)" }, { - "mm_beamer_yellow_13", - "mm_beamer", - "yellow beamer (270\xb0)" + "mm_teleporter_yellow_13", + "mm_teleporter", + "yellow teleporter (270\xb0)" }, { - "mm_beamer_yellow_14", - "mm_beamer", - "yellow beamer (292.5\xb0)" + "mm_teleporter_yellow_14", + "mm_teleporter", + "yellow teleporter (292.5\xb0)" }, { - "mm_beamer_yellow_15", - "mm_beamer", - "yellow beamer (315\xb0)" + "mm_teleporter_yellow_15", + "mm_teleporter", + "yellow teleporter (315\xb0)" }, { - "mm_beamer_yellow_16", - "mm_beamer", - "yellow beamer (337.5\xb0)" + "mm_teleporter_yellow_16", + "mm_teleporter", + "yellow teleporter (337.5\xb0)" }, { - "mm_beamer_green_1", - "mm_beamer", - "green beamer (0\xb0)" + "mm_teleporter_green_1", + "mm_teleporter", + "green teleporter (0\xb0)" }, { - "mm_beamer_green_2", - "mm_beamer", - "green beamer (22.5\xb0)" + "mm_teleporter_green_2", + "mm_teleporter", + "green teleporter (22.5\xb0)" }, { - "mm_beamer_green_3", - "mm_beamer", - "green beamer (45\xb0)" + "mm_teleporter_green_3", + "mm_teleporter", + "green teleporter (45\xb0)" }, { - "mm_beamer_green_4", - "mm_beamer", - "green beamer (67.5\xb0)" + "mm_teleporter_green_4", + "mm_teleporter", + "green teleporter (67.5\xb0)" }, { - "mm_beamer_green_5", - "mm_beamer", - "green beamer (90\xb0)" + "mm_teleporter_green_5", + "mm_teleporter", + "green teleporter (90\xb0)" }, { - "mm_beamer_green_6", - "mm_beamer", - "green beamer (112.5\xb0)" + "mm_teleporter_green_6", + "mm_teleporter", + "green teleporter (112.5\xb0)" }, { - "mm_beamer_green_7", - "mm_beamer", - "green beamer (135\xb0)" + "mm_teleporter_green_7", + "mm_teleporter", + "green teleporter (135\xb0)" }, { - "mm_beamer_green_8", - "mm_beamer", - "green beamer (157.5\xb0)" + "mm_teleporter_green_8", + "mm_teleporter", + "green teleporter (157.5\xb0)" }, { - "mm_beamer_green_9", - "mm_beamer", - "green beamer (180\xb0)" + "mm_teleporter_green_9", + "mm_teleporter", + "green teleporter (180\xb0)" }, { - "mm_beamer_green_10", - "mm_beamer", - "green beamer (202.5\xb0)" + "mm_teleporter_green_10", + "mm_teleporter", + "green teleporter (202.5\xb0)" }, { - "mm_beamer_green_11", - "mm_beamer", - "green beamer (225\xb0)" + "mm_teleporter_green_11", + "mm_teleporter", + "green teleporter (225\xb0)" }, { - "mm_beamer_green_12", - "mm_beamer", - "green beamer (247.5\xb0)" + "mm_teleporter_green_12", + "mm_teleporter", + "green teleporter (247.5\xb0)" }, { - "mm_beamer_green_13", - "mm_beamer", - "green beamer (270\xb0)" + "mm_teleporter_green_13", + "mm_teleporter", + "green teleporter (270\xb0)" }, { - "mm_beamer_green_14", - "mm_beamer", - "green beamer (292.5\xb0)" + "mm_teleporter_green_14", + "mm_teleporter", + "green teleporter (292.5\xb0)" }, { - "mm_beamer_green_15", - "mm_beamer", - "green beamer (315\xb0)" + "mm_teleporter_green_15", + "mm_teleporter", + "green teleporter (315\xb0)" }, { - "mm_beamer_green_16", - "mm_beamer", - "green beamer (337.5\xb0)" + "mm_teleporter_green_16", + "mm_teleporter", + "green teleporter (337.5\xb0)" }, { - "mm_beamer_blue_1", - "mm_beamer", - "blue beamer (0\xb0)" + "mm_teleporter_blue_1", + "mm_teleporter", + "blue teleporter (0\xb0)" }, { - "mm_beamer_blue_2", - "mm_beamer", - "blue beamer (22.5\xb0)" + "mm_teleporter_blue_2", + "mm_teleporter", + "blue teleporter (22.5\xb0)" }, { - "mm_beamer_blue_3", - "mm_beamer", - "blue beamer (45\xb0)" + "mm_teleporter_blue_3", + "mm_teleporter", + "blue teleporter (45\xb0)" }, { - "mm_beamer_blue_4", - "mm_beamer", - "blue beamer (67.5\xb0)" + "mm_teleporter_blue_4", + "mm_teleporter", + "blue teleporter (67.5\xb0)" }, { - "mm_beamer_blue_5", - "mm_beamer", - "blue beamer (90\xb0)" + "mm_teleporter_blue_5", + "mm_teleporter", + "blue teleporter (90\xb0)" }, { - "mm_beamer_blue_6", - "mm_beamer", - "blue beamer (112.5\xb0)" + "mm_teleporter_blue_6", + "mm_teleporter", + "blue teleporter (112.5\xb0)" }, { - "mm_beamer_blue_7", - "mm_beamer", - "blue beamer (135\xb0)" + "mm_teleporter_blue_7", + "mm_teleporter", + "blue teleporter (135\xb0)" }, { - "mm_beamer_blue_8", - "mm_beamer", - "blue beamer (157.5\xb0)" + "mm_teleporter_blue_8", + "mm_teleporter", + "blue teleporter (157.5\xb0)" }, { - "mm_beamer_blue_9", - "mm_beamer", - "blue beamer (180\xb0)" + "mm_teleporter_blue_9", + "mm_teleporter", + "blue teleporter (180\xb0)" }, { - "mm_beamer_blue_10", - "mm_beamer", - "blue beamer (202.5\xb0)" + "mm_teleporter_blue_10", + "mm_teleporter", + "blue teleporter (202.5\xb0)" }, { - "mm_beamer_blue_11", - "mm_beamer", - "blue beamer (225\xb0)" + "mm_teleporter_blue_11", + "mm_teleporter", + "blue teleporter (225\xb0)" }, { - "mm_beamer_blue_12", - "mm_beamer", - "blue beamer (247.5\xb0)" + "mm_teleporter_blue_12", + "mm_teleporter", + "blue teleporter (247.5\xb0)" }, { - "mm_beamer_blue_13", - "mm_beamer", - "blue beamer (270\xb0)" + "mm_teleporter_blue_13", + "mm_teleporter", + "blue teleporter (270\xb0)" }, { - "mm_beamer_blue_14", - "mm_beamer", - "blue beamer (292.5\xb0)" + "mm_teleporter_blue_14", + "mm_teleporter", + "blue teleporter (292.5\xb0)" }, { - "mm_beamer_blue_15", - "mm_beamer", - "blue beamer (315\xb0)" + "mm_teleporter_blue_15", + "mm_teleporter", + "blue teleporter (315\xb0)" }, { - "mm_beamer_blue_16", - "mm_beamer", - "blue beamer (337.5\xb0)" + "mm_teleporter_blue_16", + "mm_teleporter", + "blue teleporter (337.5\xb0)" }, { "mm_mcduffin", @@ -6271,9 +6265,9 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "wooden wall (DF style)", }, - /* ----------------------------------------------------------------------- */ - /* "real" (and therefore drawable) runtime elements */ - /* ----------------------------------------------------------------------- */ + // -------------------------------------------------------------------------- + // "real" (and therefore drawable) runtime elements + // -------------------------------------------------------------------------- { "dynabomb_player_1.active", @@ -6682,9 +6676,9 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "pac man (eating down)" }, - /* ----------------------------------------------------------------------- */ - /* "unreal" (and therefore not drawable) runtime elements */ - /* ----------------------------------------------------------------------- */ + // -------------------------------------------------------------------------- + // "unreal" (and therefore not drawable) runtime elements + // -------------------------------------------------------------------------- { "blocked", @@ -6807,9 +6801,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", @@ -7237,7 +7231,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "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, @@ -7247,9 +7241,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] = { @@ -7372,7 +7366,7 @@ struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] = { ".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 } @@ -7428,25 +7422,26 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] = { ".TOONS", GFX_SPECIAL_ARG_TOONS, }, { ".SCORESOLD", GFX_SPECIAL_ARG_SCORESOLD, }, { ".SCORESNEW", GFX_SPECIAL_ARG_SCORESNEW, }, + { ".NO_TITLE", GFX_SPECIAL_ARG_NO_TITLE, }, { ".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, } }; -#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] = { @@ -7483,6 +7478,7 @@ struct FontInfo font_info[NUM_FONTS + 1] = { "font.option_on" }, { "font.value_1" }, { "font.value_2" }, + { "font.value_old_narrow" }, { "font.value_old" }, { "font.value_narrow" }, { "font.level_number.active" }, @@ -7491,16 +7487,17 @@ struct FontInfo font_info[NUM_FONTS + 1] = { "font.game_info" }, { "font.info.elements" }, { "font.info.levelset" }, + { "font.main.network_players" }, { 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] = { - /* (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", }, @@ -7534,7 +7531,7 @@ struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] = { "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", }, @@ -7571,10 +7568,15 @@ struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] = { NULL } }; +struct GlobalAnimEventInfo global_anim_event_info = +{ + NULL, 0 +}; -/* ------------------------------------------------------------------------- */ -/* music token prefix definitions */ -/* ------------------------------------------------------------------------- */ + +// ---------------------------------------------------------------------------- +// music token prefix definitions +// ---------------------------------------------------------------------------- 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" @@ -7627,7 +7629,7 @@ static void print_usage() program.command_basename); } -static void print_version() +static void print_version(void) { Print("%s", getProgramInitString()); @@ -7635,10 +7637,10 @@ static void print_version() { Print(" (%s %d.%d.%d.%d%s)", PROGRAM_TITLE_STRING, + PROGRAM_VERSION_SUPER, PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH, - PROGRAM_VERSION_BUILD, PROGRAM_VERSION_EXTRA); } @@ -7760,5 +7762,5 @@ int main(int argc, char *argv[]) EventLoop(); CloseAllAndExit(0); - return 0; /* to keep compilers happy */ + return 0; // to keep compilers happy }