X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=e7c7d89c56e4cf1dceb7d0e658fe39b38da82d47;hb=548bc4ec64319d780a7bc38a6d0141bf526c7e16;hp=3ede45320228025565437748f43b7da2b476b2ab;hpb=e618ade7dbf72d9ee207ff02ec6f79745234aa0d;p=rocksndiamonds.git diff --git a/src/game.h b/src/game.h index 3ede4532..e7c7d89c 100644 --- a/src/game.h +++ b/src/game.h @@ -14,12 +14,25 @@ #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 +#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; @@ -29,6 +42,7 @@ struct GamePanelInfo struct XY score; struct XY time; }; +#endif struct GameInfo {