projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070124-1-src
[rocksndiamonds.git]
/
src
/
game.h
diff --git
a/src/game.h
b/src/game.h
index 3ede45320228025565437748f43b7da2b476b2ab..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
{