projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved flag for "game over" from player to game structure
[rocksndiamonds.git]
/
src
/
game.h
diff --git
a/src/game.h
b/src/game.h
index 5b3c02d6c7174b82b79cdf877ec62fcff614cfe9..fffbefa2766009efdb2e86d4129312799e7a632d 100644
(file)
--- a/
src/game.h
+++ b/
src/game.h
@@
-186,10
+186,18
@@
struct GameInfo
int belt_dir_nr[4];
int switchgate_pos;
int wind_direction;
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)
boolean explosions_delayed;
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;
// values for the new EMC elements
int lenses_time_left;
int magnify_time_left;
@@
-222,8
+230,9
@@
struct GameInfo
// values for game engine snapshot control
struct GameSnapshotInfo snapshot;
// 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 LevelSolved;
+ boolean GameOver;
boolean LevelSolved_GameWon;
boolean LevelSolved_GameEnd;
boolean LevelSolved_GameWon;
boolean LevelSolved_GameEnd;
@@
-246,6
+255,7
@@
struct PlayerInfo
boolean killed; // player maybe present/active, but killed
boolean reanimated; // player maybe killed, but reanimated
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)
int index_nr; // player number (0 to 3)
int index_bit; // player number bit (1 << 0 to 1 << 3)
@@
-280,8
+290,6
@@
struct PlayerInfo
boolean gravity;
boolean gravity;
- boolean GameOver;
-
int last_move_dir;
boolean is_active;
int last_move_dir;
boolean is_active;
@@
-349,12
+357,6
@@
struct PlayerInfo
int health;
int health_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;
int key[MAX_NUM_KEYS];
int num_white_keys;
int dynabomb_count, dynabomb_size, dynabombs_left, dynabomb_xl;