major cleanup of preprocessor hell

[rocksndiamonds.git] / src / game.h

diff --git a/src/game.h b/src/game.h
index db61769a5ac04deb74627ec140f49d1b1477c424..22ea2e7ee74e1aa2ae49a9b2d38555d46eec6f25 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -1,15 +1,13 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2006 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* game.h                                                   *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//                         Holger Schemel
+//                 info@artsoft.org
+//                 http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// game.h
+// ============================================================================
 
 #ifndef GAME_H
 #define GAME_H
@@ -30,7 +28,6 @@
 #define NUM_PANEL_ELEMENTS     8
 #define NUM_PANEL_CE_SCORE     8
 
-#if 1
 struct GamePanelInfo
 {
   struct TextPosInfo level_number;
@@ -101,19 +98,6 @@ struct GameButtonInfo
   struct Rect 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 */