projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19990108-1
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 969947e10f08aa3baa0aea88eaaea551c2e2cffc..106fda2288e57bc8069a86796d5b2cfd35943d63 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-50,14
+50,10
@@
char *joystick_device_name[MAX_PLAYERS] =
DEV_JOYSTICK_3
};
DEV_JOYSTICK_3
};
-/*
-int width, height;
-*/
-
char *program_name = NULL;
int game_status = MAINMENU;
char *program_name = NULL;
int game_status = MAINMENU;
-
int game_emulation = EMU_NON
E;
+
boolean level_editor_test_game = FALS
E;
boolean network_playing = FALSE;
int button_status = MB_NOT_PRESSED;
boolean motion_status = FALSE;
boolean network_playing = FALSE;
int button_status = MB_NOT_PRESSED;
boolean motion_status = FALSE;
@@
-93,24
+89,30
@@
int lev_fieldx,lev_fieldy, scroll_x,scroll_y;
int FX = SX, FY = SY, ScrollStepSize = TILEX/8;
int ScreenMovDir = MV_NO_MOVING, ScreenMovPos = 0;
int ScreenGfxPos = 0;
int FX = SX, FY = SY, ScrollStepSize = TILEX/8;
int ScreenMovDir = MV_NO_MOVING, ScreenMovPos = 0;
int ScreenGfxPos = 0;
+int BorderElement = EL_BETON;
int GameFrameDelay = GAME_FRAME_DELAY;
int FfwdFrameDelay = FFWD_FRAME_DELAY;
int MoveSpeed = 8;
int BX1 = 0, BY1 = 0, BX2 = SCR_FIELDX-1, BY2 = SCR_FIELDY-1;
int GameFrameDelay = GAME_FRAME_DELAY;
int FfwdFrameDelay = FFWD_FRAME_DELAY;
int MoveSpeed = 8;
int BX1 = 0, BY1 = 0, BX2 = SCR_FIELDX-1, BY2 = SCR_FIELDY-1;
+int SBX_Left, SBX_Right;
+int SBY_Upper, SBY_Lower;
int ZX,ZY, ExitX,ExitY;
int AllPlayersGone;
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;
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 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;
struct OptionInfo options;
struct SetupInfo setup;
struct SetupFileList *setup_list = NULL;
@@
-170,7
+172,16
@@
char *sound_name[NUM_SOUNDS] =
"voyager",
"warnton",
"whoosh",
"voyager",
"warnton",
"whoosh",
- "zisch"
+ "zisch",
+ "base",
+ "infotron",
+ "zonkdown",
+ "zonkpush",
+ "bug",
+ "boom",
+ "booom",
+ "exit",
+ "empty"
};
/* background music */
};
/* background music */