projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
completed options for vertical text spacing on info and setup screens
[rocksndiamonds.git]
/
src
/
game.h
diff --git
a/src/game.h
b/src/game.h
index 3e62cf4d983ece67595577c665f65e67347dafe4..1d9b786df896eda57f951e5f60b1ebf537ba52e7 100644
(file)
--- a/
src/game.h
+++ b/
src/game.h
@@
-17,6
+17,8
@@
#define MAX_INVENTORY_SIZE 1000
#define MAX_INVENTORY_SIZE 1000
+#define MAX_HEALTH 100
+
#define STD_NUM_KEYS 4
#define MAX_NUM_KEYS 8
#define STD_NUM_KEYS 4
#define MAX_NUM_KEYS 8
@@
-31,12
+33,14
@@
#define STR_SNAPSHOT_MODE_OFF "off"
#define STR_SNAPSHOT_MODE_EVERY_STEP "every_step"
#define STR_SNAPSHOT_MODE_EVERY_MOVE "every_move"
#define STR_SNAPSHOT_MODE_OFF "off"
#define STR_SNAPSHOT_MODE_EVERY_STEP "every_step"
#define STR_SNAPSHOT_MODE_EVERY_MOVE "every_move"
-#define STR_SNAPSHOT_MODE_DEFAULT STR_SNAPSHOT_MODE_EVERY_MOVE
+#define STR_SNAPSHOT_MODE_EVERY_COLLECT "every_collect"
+#define STR_SNAPSHOT_MODE_DEFAULT STR_SNAPSHOT_MODE_OFF
#define SNAPSHOT_MODE_OFF 0
#define SNAPSHOT_MODE_EVERY_STEP 1
#define SNAPSHOT_MODE_EVERY_MOVE 2
#define SNAPSHOT_MODE_OFF 0
#define SNAPSHOT_MODE_EVERY_STEP 1
#define SNAPSHOT_MODE_EVERY_MOVE 2
-#define SNAPSHOT_MODE_DEFAULT SNAPSHOT_MODE_EVERY_MOVE
+#define SNAPSHOT_MODE_EVERY_COLLECT 3
+#define SNAPSHOT_MODE_DEFAULT SNAPSHOT_MODE_OFF
struct GamePanelInfo
struct GamePanelInfo
@@
-55,6
+59,9
@@
struct GamePanelInfo
struct TextPosInfo time_hh;
struct TextPosInfo time_mm;
struct TextPosInfo time_ss;
struct TextPosInfo time_hh;
struct TextPosInfo time_mm;
struct TextPosInfo time_ss;
+ struct TextPosInfo time_anim;
+ struct TextPosInfo health;
+ struct TextPosInfo health_anim;
struct TextPosInfo frame;
struct TextPosInfo shield_normal;
struct TextPosInfo shield_normal_time;
struct TextPosInfo frame;
struct TextPosInfo shield_normal;
struct TextPosInfo shield_normal_time;
@@
-105,6
+112,7
@@
struct GameButtonInfo
struct XY redo;
struct XY save;
struct XY redo;
struct XY save;
+ struct XY pause2;
struct XY load;
struct XY sound_music;
struct XY load;
struct XY sound_music;
@@
-118,6
+126,9
@@
struct GameSnapshotInfo
byte last_action[MAX_PLAYERS];
boolean changed_action;
byte last_action[MAX_PLAYERS];
boolean changed_action;
+ boolean collected_item;
+
+ boolean save_snapshot;
};
struct GameInfo
};
struct GameInfo
@@
-127,6
+138,7
@@
struct GameInfo
struct GameButtonInfo button;
/* values for graphics engine customization */
struct GameButtonInfo button;
/* values for graphics engine customization */
+ int graphics_engine_version;
boolean use_native_emc_graphics_engine;
boolean use_native_sp_graphics_engine;
boolean use_masked_pushing;
boolean use_native_emc_graphics_engine;
boolean use_native_sp_graphics_engine;
boolean use_masked_pushing;
@@
-222,6
+234,9
@@
struct PlayerInfo
byte programmed_action; /* action forced by game itself (like moving
through doors); overrides other actions */
byte programmed_action; /* action forced by game itself (like moving
through doors); overrides other actions */
+ struct MouseActionInfo mouse_action; /* (used by MM engine only) */
+ struct MouseActionInfo effective_mouse_action; /* (used by MM engine only) */
+
int jx, jy, last_jx, last_jy;
int MovDir, MovPos, GfxDir, GfxPos;
int Frame, StepFrame;
int jx, jy, last_jx, last_jy;
int MovDir, MovPos, GfxDir, GfxPos;
int Frame, StepFrame;
@@
-246,8
+261,10
@@
struct PlayerInfo
boolean LevelSolved_PanelOff;
boolean LevelSolved_SaveTape;
boolean LevelSolved_SaveScore;
boolean LevelSolved_PanelOff;
boolean LevelSolved_SaveTape;
boolean LevelSolved_SaveScore;
+
int LevelSolved_CountingTime;
int LevelSolved_CountingScore;
int LevelSolved_CountingTime;
int LevelSolved_CountingScore;
+ int LevelSolved_CountingHealth;
int last_move_dir;
int last_move_dir;
@@
-267,8
+284,15
@@
struct PlayerInfo
boolean is_bored;
boolean is_sleeping;
boolean is_bored;
boolean is_sleeping;
+ boolean was_waiting;
+ boolean was_moving;
+ boolean was_snapping;
+ boolean was_dropping;
+
boolean cannot_move;
boolean cannot_move;
+ boolean force_dropping; /* needed for single step mode */
+
int frame_counter_bored;
int frame_counter_sleeping;
int frame_counter_bored;
int frame_counter_sleeping;
@@
-306,6
+330,9
@@
struct PlayerInfo
int score;
int score_final;
int score;
int score_final;
+ int health;
+ int health_final;
+
int gems_still_needed;
int sokobanfields_still_needed;
int lights_still_needed;
int gems_still_needed;
int sokobanfields_still_needed;
int lights_still_needed;
@@
-332,6
+359,8
@@
void DEBUG_SetMaximumDynamite();
void GetPlayerConfig(void);
int GetElementFromGroupElement(int);
void GetPlayerConfig(void);
int GetElementFromGroupElement(int);
+int getPlayerInventorySize(int);
+
void DrawGameValue_Time(int);
void DrawGameDoorValues(void);
void DrawGameValue_Time(int);
void DrawGameDoorValues(void);
@@
-340,7
+369,7
@@
void UpdateAndDisplayGameControlValues();
void InitGameSound();
void InitGame();
void InitGameSound();
void InitGame();
-void UpdateEngineValues(int, int);
+void UpdateEngineValues(int, int
, int, int
);
void GameWon(void);
void GameEnd(void);
void GameWon(void);
void GameEnd(void);
@@
-354,6
+383,8
@@
void StartGameActions(boolean, boolean, int);
void GameActions(void);
void GameActions_EM_Main();
void GameActions_SP_Main();
void GameActions(void);
void GameActions_EM_Main();
void GameActions_SP_Main();
+void GameActions_MM_Main();
+void GameActions_RND_Main();
void GameActions_RND();
void ScrollLevel(int, int);
void GameActions_RND();
void ScrollLevel(int, int);
@@
-361,6
+392,10
@@
void ScrollLevel(int, int);
void InitPlayLevelSound();
void PlayLevelSound_EM(int, int, int, int);
void PlayLevelSound_SP(int, int, int, int);
void InitPlayLevelSound();
void PlayLevelSound_EM(int, int, int, int);
void PlayLevelSound_SP(int, int, int, int);
+void PlayLevelSound_MM(int, int, int, int);
+void PlaySound_MM(int);
+void PlaySoundLoop_MM(int);
+void StopSound_MM(int);
void RaiseScore(int);
void RaiseScoreElement(int);
void RaiseScore(int);
void RaiseScoreElement(int);
@@
-375,7
+410,8
@@
void FreeEngineSnapshotSingle();
void FreeEngineSnapshotList();
void LoadEngineSnapshotSingle();
void SaveEngineSnapshotSingle();
void FreeEngineSnapshotList();
void LoadEngineSnapshotSingle();
void SaveEngineSnapshotSingle();
-boolean SaveEngineSnapshotToList();
+boolean CheckSaveEngineSnapshotToList();
+void SaveEngineSnapshotToList();
void SaveEngineSnapshotToListInitial();
boolean CheckEngineSnapshotSingle();
boolean CheckEngineSnapshotList();
void SaveEngineSnapshotToListInitial();
boolean CheckEngineSnapshotSingle();
boolean CheckEngineSnapshotList();