rnd-19981016-2

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index af0d9a9cf5b71ce01051d0c1868965eb0f055e77..0e967f3d7ca1256bb3f072263e5466a6a12493bd 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -209,7 +209,11 @@ struct HiScore
 
 struct PlayerInfo
 {
-  int active, local;
+  BOOL present;                        /* player present in level playfield */
+  BOOL connected;              /* player connected locally or via network */
+  BOOL local;                  /* player connected locally */
+  BOOL active;                 /* player (present && connected) */
+
   int index_nr, client_nr, element_nr;
 
   char login_name[MAX_NAMELEN];
@@ -221,13 +225,11 @@ struct PlayerInfo
 
   int jx,jy, last_jx,last_jy;
   int MovDir, MovPos, GfxPos;
-  int Pushing, Frame;
-
-  int gone, LevelSolved, GameOver;
-
-  long actual_frame_counter;
+  int Frame;
 
-  int frame_reset_delay;
+  BOOL Pushing;
+  BOOL gone, LevelSolved, GameOver;
+  BOOL snapped;
 
   long move_delay;
   int last_move_dir;
@@ -235,7 +237,9 @@ struct PlayerInfo
   long push_delay;
   int push_delay_value;
 
-  int snapped;
+  int frame_reset_delay;
+
+  long actual_frame_counter;
 
   int score;
   int gems_still_needed;
@@ -323,11 +327,13 @@ extern char              *program_name;
 extern char           *display_name;
 extern char           *server_host;
 extern int             server_port;
-extern int             standalone;
+extern int             serveronly;
+extern int             network;
 extern int             verbose;
 
 extern int             game_status;
 extern int             game_emulation;
+extern int             network_playing;
 extern int             button_status, motion_status;
 extern int             key_joystick_mapping;
 extern int             global_joystick_status, joystick_status;