X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=142dd6534a48aa93108af8796a539e01f68f8b66;hb=2a4878a4c2873df0426a22c357533656928748c8;hp=47c9100837c23fd051c26c47a2f7112425335a18;hpb=4f767d54c7ac468e9a42e22caf716111be1ceba9;p=rocksndiamonds.git diff --git a/src/main.c b/src/main.c index 47c91008..142dd653 100644 --- a/src/main.c +++ b/src/main.c @@ -53,6 +53,7 @@ char *joystick_device_name[MAX_PLAYERS] = char *program_name = NULL; int game_status = MAINMENU; +boolean level_editor_test_game = FALSE; boolean network_playing = FALSE; int button_status = MB_NOT_PRESSED; boolean motion_status = FALSE; @@ -94,18 +95,21 @@ int MoveSpeed = 8; int BX1 = 0, BY1 = 0, BX2 = SCR_FIELDX-1, BY2 = SCR_FIELDY-1; int ZX,ZY, ExitX,ExitY; int AllPlayersGone; -int FrameCounter, TimeFrames, TimeLeft; -int MampferNr, SiebAktiv; +int FrameCounter, TimeFrames, TimePlayed, TimeLeft; +int MampferMax, MampferNr; +boolean SiebAktiv; +int SiebCount; + +int game_emulation = EMU_NONE; boolean network_player_action_received = FALSE; -int TestPlayer = 0; struct LevelDirInfo leveldir[MAX_LEVDIR_ENTRIES]; struct LevelInfo level; struct PlayerInfo stored_player[MAX_PLAYERS], *local_player = NULL; struct HiScore highscore[MAX_SCORE_ENTRIES]; struct SoundInfo Sound[NUM_SOUNDS]; -struct RecordingInfo tape; +struct TapeInfo tape; struct OptionInfo options; struct SetupInfo setup; struct SetupFileList *setup_list = NULL; @@ -165,7 +169,16 @@ char *sound_name[NUM_SOUNDS] = "voyager", "warnton", "whoosh", - "zisch" + "zisch", + "base", + "infotron", + "zonkdown", + "zonkpush", + "bug", + "boom", + "booom", + "exit", + "empty" }; /* background music */