X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.h;h=a0ffe85a31b15e7dff94dee66e4c7ef24844c3b9;hp=553ec4b7498b516879a041fafb2f736e304189f7;hb=823ae65fd14a8ab5e88adc0c711acecb2fb36955;hpb=64e7c54dce6ea8c063f04198c64c5057d751c928 diff --git a/src/game.h b/src/game.h index 553ec4b7..a0ffe85a 100644 --- a/src/game.h +++ b/src/game.h @@ -190,6 +190,13 @@ struct GameInfo boolean envelope_active; boolean no_time_limit; // (variable only in very special case) + 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; @@ -221,6 +228,18 @@ struct GameInfo // values for game engine snapshot control struct GameSnapshotInfo snapshot; + + // values for handling states for solved level + boolean LevelSolved; + + boolean LevelSolved_GameWon; + boolean LevelSolved_GameEnd; + boolean LevelSolved_SaveTape; + boolean LevelSolved_SaveScore; + + int LevelSolved_CountingTime; + int LevelSolved_CountingScore; + int LevelSolved_CountingHealth; }; struct PlayerInfo @@ -268,16 +287,7 @@ struct PlayerInfo boolean gravity; - boolean LevelSolved, GameOver; - - boolean LevelSolved_GameWon; - boolean LevelSolved_GameEnd; - boolean LevelSolved_SaveTape; - boolean LevelSolved_SaveScore; - - int LevelSolved_CountingTime; - int LevelSolved_CountingScore; - int LevelSolved_CountingHealth; + boolean GameOver; int last_move_dir; @@ -346,11 +356,6 @@ struct PlayerInfo int health; int health_final; - int gems_still_needed; - int sokobanfields_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;