X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=86c26eeb9c90b2758ed9b3f10d587ba6aaab380f;hb=8b685a52cd9bdf6ad20d1fb6e4c8f8d70c99603e;hp=49c866a57672d483343d9de876038c6609aca4dd;hpb=abe44529b439ad39b4d8dbf19cbd67c9b9844279;p=rocksndiamonds.git diff --git a/src/game.h b/src/game.h index 49c866a5..86c26eeb 100644 --- a/src/game.h +++ b/src/game.h @@ -28,7 +28,6 @@ #define NUM_PANEL_ELEMENTS 8 #define NUM_PANEL_CE_SCORE 8 -#if 1 struct GamePanelInfo { struct TextPosInfo level_number; @@ -87,31 +86,18 @@ struct GamePanelInfo struct GameButtonInfo { - struct Rect stop; - struct Rect pause; - struct Rect play; + struct XY stop; + struct XY pause; + struct XY play; - struct Rect sound_music; - struct Rect sound_loops; - struct Rect sound_simple; + struct XY sound_music; + struct XY sound_loops; + struct XY sound_simple; - struct Rect save; - struct Rect load; + struct XY save; + struct XY load; }; -#else - -struct GamePanelInfo -{ - struct XY level; - struct XY gems; - struct XY inventory; - struct XY keys; - struct XY score; - struct XY time; -}; -#endif - struct GameInfo { /* values for control panel */