X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.h;h=602922bdff6c207b8ddddea3e02e78f9c2648cd3;hp=5b3c02d6c7174b82b79cdf877ec62fcff614cfe9;hb=dec5093fc78bfe1356d764c2432fed6566b2af66;hpb=10a305960c9cc79afceb6c15c410796776bfe58b diff --git a/src/game.h b/src/game.h index 5b3c02d6..602922bd 100644 --- a/src/game.h +++ b/src/game.h @@ -186,10 +186,24 @@ 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; + int lights_still_needed; + int players_still_needed; + int friends_still_needed; + // values for the new EMC elements int lenses_time_left; int magnify_time_left; @@ -222,8 +236,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; @@ -246,6 +261,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) @@ -280,8 +296,6 @@ struct PlayerInfo boolean gravity; - boolean GameOver; - int last_move_dir; boolean is_active; @@ -343,18 +357,6 @@ struct PlayerInfo int step_counter; - int score; - int score_final; - - int health; - int health_final; - - int gems_still_needed; - int sokoban_fields_still_needed; - int sokoban_objects_still_needed; - int lights_still_needed; - int players_still_needed; - int friends_still_needed; int key[MAX_NUM_KEYS]; int num_white_keys; int dynabomb_count, dynabomb_size, dynabombs_left, dynabomb_xl;