X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=195f4202a1dce1a8cb858b142f8f3b2dd15c94eb;hb=85ab2d263ae6041c7263a4330071512c436382f9;hp=a0ffe85a31b15e7dff94dee66e4c7ef24844c3b9;hpb=823ae65fd14a8ab5e88adc0c711acecb2fb36955;p=rocksndiamonds.git diff --git a/src/game.h b/src/game.h index a0ffe85a..195f4202 100644 --- a/src/game.h +++ b/src/game.h @@ -186,10 +186,17 @@ struct GameInfo int belt_dir_nr[4]; int switchgate_pos; int wind_direction; + boolean explosions_delayed; 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; @@ -197,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; @@ -229,8 +241,9 @@ struct GameInfo // values for game engine snapshot control struct GameSnapshotInfo snapshot; - // values for handling states for solved level + // values for handling states for solved level and game over boolean LevelSolved; + boolean GameOver; boolean LevelSolved_GameWon; boolean LevelSolved_GameEnd; @@ -253,6 +266,7 @@ struct PlayerInfo boolean killed; // player maybe present/active, but killed boolean reanimated; // player maybe killed, but reanimated + boolean buried; // player finally killed and removed int index_nr; // player number (0 to 3) int index_bit; // player number bit (1 << 0 to 1 << 3) @@ -287,8 +301,6 @@ struct PlayerInfo boolean gravity; - boolean GameOver; - int last_move_dir; boolean is_active; @@ -350,12 +362,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;