X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=1ee567d06c6e28209ffadd249d531b28f068b0f0;hb=9cfd3853252303df85d4fb925993448788d03483;hp=bb9ef845d58905b865178f41312e5e523e5095e0;hpb=dbdefdcdfa0fa58296160ffc6b72fea58bea5c75;p=rocksndiamonds.git diff --git a/src/main.c b/src/main.c index bb9ef845..1ee567d0 100644 --- a/src/main.c +++ b/src/main.c @@ -53,7 +53,7 @@ char *joystick_device_name[MAX_PLAYERS] = char *program_name = NULL; int game_status = MAINMENU; -int game_emulation = EMU_NONE; +boolean level_editor_test_game = FALSE; boolean network_playing = FALSE; int button_status = MB_NOT_PRESSED; boolean motion_status = FALSE; @@ -96,17 +96,16 @@ 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 MampferMax, MampferNr, SiebAktiv; 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;