X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.h;h=5a96d4fc630cb23fc67d253984b1ec7b8afdfe8b;hp=fffbefa2766009efdb2e86d4129312799e7a632d;hb=1be3e5c990b84f8548a80ccd6b7b209a88312141;hpb=d18eaeed7b265b71d147e9dfcd0a4ba3348e22f8 diff --git a/src/game.h b/src/game.h index fffbefa2..5a96d4fc 100644 --- a/src/game.h +++ b/src/game.h @@ -191,6 +191,12 @@ struct GameInfo boolean envelope_active; boolean no_time_limit; // (variable only in very special case) + int score; + int score_final; + + int health; + int health_final; + int gems_still_needed; int sokoban_fields_still_needed; int sokoban_objects_still_needed; @@ -198,6 +204,11 @@ struct GameInfo int players_still_needed; int friends_still_needed; + int robot_wheel_x, robot_wheel_y; + int exit_x, exit_y; + + boolean all_players_gone; + // values for the new EMC elements int lenses_time_left; int magnify_time_left; @@ -232,6 +243,7 @@ struct GameInfo // values for handling states for solved level and game over boolean LevelSolved; + boolean GamePlayed; boolean GameOver; boolean LevelSolved_GameWon; @@ -263,12 +275,12 @@ struct PlayerInfo int client_nr; // network client identifier byte action; // action from local input device - byte mapped_action; // action mapped from device to player byte effective_action; /* action acknowledged from network server or summarized over all configured input devices when in single player mode */ byte programmed_action; /* action forced by game itself (like moving through doors); overrides other actions */ + byte snap_action; // action from TAS snap keys struct MouseActionInfo mouse_action; // (used by MM engine only) struct MouseActionInfo effective_mouse_action; // (used by MM engine only) @@ -351,12 +363,6 @@ struct PlayerInfo int step_counter; - int score; - int score_final; - - int health; - int health_final; - int key[MAX_NUM_KEYS]; int num_white_keys; int dynabomb_count, dynabomb_size, dynabombs_left, dynabomb_xl;