X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=4dc5883b60e36dea7af94eca4275150c9ac543a5;hp=7a7484549d3e30956c66e9cb3f92f8c668ad72b0;hb=34efaa3925a28cb95ecb05bf2c693c16f6edfe2f;hpb=4f767d54c7ac468e9a42e22caf716111be1ceba9 diff --git a/src/main.h b/src/main.h index 7a748454..4dc5883b 100644 --- a/src/main.h +++ b/src/main.h @@ -17,9 +17,9 @@ #include #include #include -#include #include #include +#include #ifndef MSDOS #define XK_MISCELLANY @@ -48,8 +48,8 @@ typedef unsigned char boolean; typedef unsigned char byte; #ifndef FALSE -#define FALSE 0 -#define TRUE (!FALSE) +#define FALSE 0 +#define TRUE (!FALSE) #endif #define WIN_XSIZE 672 @@ -345,7 +345,7 @@ struct LevelDirInfo boolean readonly; }; -struct RecordingInfo +struct TapeInfo { int level_nr; unsigned long random_seed; @@ -358,6 +358,7 @@ struct RecordingInfo boolean recording, playing, pausing; boolean fast_forward; boolean changed; + boolean player_participates[MAX_PLAYERS]; struct { byte action[MAX_PLAYERS]; @@ -432,13 +433,12 @@ extern int FrameCounter, TimeFrames, TimeLeft; extern int MampferNr, SiebAktiv; extern boolean network_player_action_received; -extern int TestPlayer; extern struct LevelDirInfo leveldir[]; extern struct LevelInfo level; extern struct PlayerInfo stored_player[], *local_player; extern struct HiScore highscore[]; -extern struct RecordingInfo tape; +extern struct TapeInfo tape; extern struct SoundInfo Sound[]; extern struct JoystickInfo joystick[]; extern struct OptionInfo options; @@ -1035,16 +1035,17 @@ extern int num_bg_loops; #define FC_SPECIAL2 5 /* values for game_status */ -#define MAINMENU 0 -#define PLAYING 1 -#define LEVELED 2 -#define HELPSCREEN 3 -#define CHOOSELEVEL 4 -#define TYPENAME 5 -#define HALLOFFAME 6 -#define SETUP 7 -#define SETUPINPUT 8 -#define EXITGAME 9 +#define EXITGAME 0 +#define MAINMENU 1 +#define PLAYING 2 +#define LEVELED 3 +#define HELPSCREEN 4 +#define CHOOSELEVEL 5 +#define TYPENAME 6 +#define HALLOFFAME 7 +#define SETUP 8 +#define SETUPINPUT 9 +#define CALIBRATION 10 #ifndef GAME_DIR #define GAME_DIR "." @@ -1064,7 +1065,7 @@ extern int num_bg_loops; #define COPYRIGHT_STRING "Copyright ^1995-98 by Holger Schemel" /* default name for empty highscore entry */ -#define EMPTY_ALIAS "NO_NAME" +#define EMPTY_PLAYER_NAME "no name" /* values for button_status */ #define MB_NOT_PRESSED FALSE