X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=92ab3451d4a3d65fe75d15d5bf95d41d90bda541;hb=2dfebdae62bb9c56904025e6bfb9f1f931745ac0;hp=3ede45320228025565437748f43b7da2b476b2ab;hpb=deaffde6674623375a4363f55fa6fbf4ccf2b514;p=rocksndiamonds.git diff --git a/src/game.h b/src/game.h index 3ede4532..92ab3451 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 { @@ -128,7 +142,9 @@ struct PlayerInfo boolean LevelSolved, GameOver; + boolean LevelSolved_GameWon; boolean LevelSolved_GameEnd; + boolean LevelSolved_PanelOff; boolean LevelSolved_SaveTape; boolean LevelSolved_SaveScore;