X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=c257bb4062115b2e76886d7110076f4903198cf7;hb=eb09b9aa5521e286723c668030825cd0e3470c3c;hp=297efe8502254ba09972f195dbea379219e08713;hpb=74ed6f367314f4b4f373b45f82cedd04595a2608;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 297efe85..c257bb40 100644
--- a/src/game.c
+++ b/src/game.c
@@ -87,16 +87,10 @@
 #define EX_TYPE_DYNA		(1 << 4)
 #define EX_TYPE_SINGLE_TILE	(EX_TYPE_CENTER | EX_TYPE_BORDER)
 
-#if 1
 #define PANEL_OFF()		(local_player->LevelSolved_PanelOff)
 #define	PANEL_DEACTIVATED(p)	((p)->x < 0 || (p)->y < 0 || PANEL_OFF())
-#define PANEL_XPOS(p)		(DX + ALIGNED_MENU_XPOS(p))
-#define PANEL_YPOS(p)		(DY + ALIGNED_MENU_YPOS(p))
-#else
-#define	PANEL_DEACTIVATED(p)	((p).x < 0 || (p).y < 0)
-#define PANEL_XPOS(p)		(ALIGNED_XPOS((p).x, (p).width, (p).align))
-#define PANEL_YPOS(p)		((p).y)
-#endif
+#define PANEL_XPOS(p)		(DX + ALIGNED_TEXT_XPOS(p))
+#define PANEL_YPOS(p)		(DY + ALIGNED_TEXT_YPOS(p))
 
 /* special positions in the game control window (relative to control window) */
 #define XX_LEVEL1		(PANEL_XPOS(game.panel.level))