X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.c;h=59faa000e1ccb64b15051c6a1dc8cd2ee5fa7f12;hp=1805b6e0db9702a1363dadde7c424b0b2b5475e9;hb=20e9d89a234989e55d9d232b6e5ba5a81342ced6;hpb=54cd73c4e6a8fc9521f0adda5501cd09eb294b4c diff --git a/src/main.c b/src/main.c index 1805b6e0..59faa000 100644 --- a/src/main.c +++ b/src/main.c @@ -33,11 +33,8 @@ 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; @@ -126,7 +123,6 @@ int BX1, BY1; int BX2, BY2; int SBX_Left, SBX_Right; int SBY_Upper, SBY_Lower; -int ZX, ZY; int TimeFrames, TimePlayed, TimeLeft, TapeTime; @@ -1179,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'" }, @@ -4239,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'" }, @@ -7572,6 +7568,11 @@ struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] = { NULL } }; +struct GlobalAnimEventInfo global_anim_event_info = +{ + NULL, 0 +}; + // ---------------------------------------------------------------------------- // music token prefix definitions