projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070126-1-src
[rocksndiamonds.git]
/
src
/
game.h
diff --git
a/src/game.h
b/src/game.h
index 4532367944b698fb9d1a4396eece66ef9c15d58d..e7c7d89c56e4cf1dceb7d0e658fe39b38da82d47 100644
(file)
--- a/
src/game.h
+++ b/
src/game.h
@@
-14,12
+14,25
@@
#ifndef GAME_H
#define GAME_H
#ifndef GAME_H
#define GAME_H
+/* (not included here due to collisions with Emerald Mine engine definitions) */
+/* #include "main.h" */
#define MAX_INVENTORY_SIZE 1000
#define STD_NUM_KEYS 4
#define MAX_NUM_KEYS 8
#define MAX_INVENTORY_SIZE 1000
#define STD_NUM_KEYS 4
#define MAX_NUM_KEYS 8
+#if 1
+struct GamePanelInfo
+{
+ struct TextPosInfo level;
+ struct TextPosInfo gems;
+ struct TextPosInfo inventory;
+ struct TextPosInfo keys;
+ struct TextPosInfo score;
+ struct TextPosInfo time;
+};
+#else
struct GamePanelInfo
{
struct XY level;
struct GamePanelInfo
{
struct XY level;
@@
-29,6
+42,7
@@
struct GamePanelInfo
struct XY score;
struct XY time;
};
struct XY score;
struct XY time;
};
+#endif
struct GameInfo
{
struct GameInfo
{
@@
-96,6
+110,7
@@
struct PlayerInfo
boolean present; /* player present in level playfield */
boolean connected; /* player connected (locally or via network) */
boolean active; /* player present and connected */
boolean present; /* player present in level playfield */
boolean connected; /* player connected (locally or via network) */
boolean active; /* player present and connected */
+ boolean killed; /* player maybe present/active, but killed */
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) */
@@
-193,6
+208,7
@@
struct PlayerInfo
int lights_still_needed;
int friends_still_needed;
int key[MAX_NUM_KEYS];
int lights_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 shield_normal_time_left;
int shield_deadly_time_left;
int dynabomb_count, dynabomb_size, dynabombs_left, dynabomb_xl;
int shield_normal_time_left;
int shield_deadly_time_left;
@@
-240,6
+256,8
@@
void PlayLevelSound_EM(int, int, int, int);
void RaiseScore(int);
void RaiseScoreElement(int);
void RaiseScore(int);
void RaiseScoreElement(int);
+
+void RequestQuitGameExt(boolean, boolean, char *);
void RequestQuitGame(boolean);
unsigned int InitEngineRandom_RND(long);
void RequestQuitGame(boolean);
unsigned int InitEngineRandom_RND(long);