rnd-20070403-2-src

* added new pseudo game mode "PANEL" to define panel fonts and graphics
  - panel fonts now use ".PANEL" suffix instead of ".PLAYING" suffix
  - panel graphics now use ".PANEL" suffix instead of ".DOOR" suffix
  (else graphics would have to use ".PLAYING", which would be confusing)

diff --git a/ChangeLog b/ChangeLog
index 6198cbd2173ec2b3b3ceb1e5ca2684419882db9e..52c3f76c5d2d9dfd86b5d5623ec5b594765b324b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-03
+       * added new pseudo game mode "PANEL" to define panel fonts and graphics
+         - panel fonts now use ".PANEL" suffix instead of ".PLAYING" suffix
+         - panel graphics now use ".PANEL" suffix instead of ".DOOR" suffix
+         (else graphics would have to use ".PLAYING", which would be confusing)
+
 2007-04-02
        * added attribute ".tile_size" for element style game panel controls
 

diff --git a/src/conf_fnt.c b/src/conf_fnt.c
index 8eb96e51dd5e83690e2545ff4ead423344976c6b..a0f6dcffc997a14085ea47d5eb2c72abfea72db1 100644 (file)
--- a/src/conf_fnt.c
+++ b/src/conf_fnt.c
@@ -92,8 +92,8 @@ font_to_graphic[] =
     IMG_FONT_TEXT_1_ACTIVE_SCORES
   },
   {
-    FONT_TEXT_1,                               GFX_SPECIAL_ARG_PLAYING,
-    IMG_FONT_TEXT_1_PLAYING
+    FONT_TEXT_1,                               GFX_SPECIAL_ARG_PANEL,
+    IMG_FONT_TEXT_1_PANEL
   },
   {
     FONT_TEXT_1,                               GFX_SPECIAL_ARG_DOOR,

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 7034a099a04eefab01e783461f09ef3fdd5482f4..8bbf6186b89c45af879db879d00be07003e09a0e 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -4690,8 +4690,8 @@ struct ConfigInfo image_config[] =
   { "font.text_1.active.SCORES.y",             "0"                     },
   { "font.text_1.active.SCORES.width",         "16"                    },
   { "font.text_1.active.SCORES.height",                "32"                    },
-  { "font.text_1.PLAYING",                     UNDEFINED_FILENAME      },
-  { "font.text_1.PLAYING.clone_from",          "font.level_number"     },
+  { "font.text_1.PANEL",                       UNDEFINED_FILENAME      },
+  { "font.text_1.PANEL.clone_from",            "font.level_number"     },
   { "font.text_1.DOOR",                                UNDEFINED_FILENAME      },
   { "font.text_1.DOOR.clone_from",             "font.level_number"     },
   { "font.text_2",                             "RocksFontSmall.pcx"    },

diff --git a/src/conf_gfx.h b/src/conf_gfx.h
index fe72c69f7c1025c0a0d2b6a2d1f1b1706f138fac..e827cfbafa73c5ec68a3b7cb0beaad115d57ec01 100644 (file)
--- a/src/conf_gfx.h
+++ b/src/conf_gfx.h
@@ -1684,7 +1684,7 @@
 #define IMG_FONT_TEXT_1_PREVIEW                                1663
 #define IMG_FONT_TEXT_1_SCORES                         1664
 #define IMG_FONT_TEXT_1_ACTIVE_SCORES                  1665
-#define IMG_FONT_TEXT_1_PLAYING                                1666
+#define IMG_FONT_TEXT_1_PANEL                          1666
 #define IMG_FONT_TEXT_1_DOOR                           1667
 #define IMG_FONT_TEXT_2                                        1668
 #define IMG_FONT_TEXT_2_MAIN                           1669

diff --git a/src/conftime.h b/src/conftime.h
index 16409a5d75c96cf5b943e631232532c393d3a297..1489e6f9eeadbeda313ce98c173ffd4b0c0dd8e8 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2007-04-03 01:38"
+#define COMPILE_DATE_STRING "2007-04-03 19:40"

diff --git a/src/game.c b/src/game.c
index 9fb95c23bad7af9d5302e0e2acf891aea88d86df..d2787a10f8da741baf8f8e6d5433f5a5a789083f 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -2027,6 +2027,8 @@ void DisplayGameControlValues()
 {
   int i;
 
+  game_status = GAME_MODE_PSEUDO_PANEL;
+
   for (i = 0; game_controls[i].nr != -1; i++)
   {
     int nr = game_controls[i].nr;
@@ -2101,7 +2103,7 @@ void DisplayGameControlValues()
       }
       else
       {
-       int graphic = el2doorimg(value);
+       int graphic = el2panelimg(value);
 
        DrawSizedGraphicExt(drawto, dst_x, dst_y, graphic, size);
       }
@@ -2124,6 +2126,8 @@ void DisplayGameControlValues()
 
     redraw_mask |= REDRAW_DOOR_1;
   }
+
+  game_status = GAME_MODE_PLAYING;
 }
 
 void DrawGameValue_Emeralds(int value)

diff --git a/src/main.c b/src/main.c
index 5174a1624edd4d3e52fec1d195f6fa118b45587c..e6401836bbfecfef8e62242317d50cb356ba1ce7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -5376,6 +5376,7 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
   { ".SETUP",                  GFX_SPECIAL_ARG_SETUP,                  },
   { ".PLAYING",                        GFX_SPECIAL_ARG_PLAYING,                },
   { ".DOOR",                   GFX_SPECIAL_ARG_DOOR,                   },
+  { ".PANEL",                  GFX_SPECIAL_ARG_PANEL,                  },
   { ".PREVIEW",                        GFX_SPECIAL_ARG_PREVIEW,                },
   { ".CRUMBLED",               GFX_SPECIAL_ARG_CRUMBLED,               },
 

diff --git a/src/main.h b/src/main.h
index 97e8ff19ca7b478ae7ecbb1bed9dbf319fff6416..3bd3d6bebe75a2c1b0b449e262b0d4ed115c828c 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1734,10 +1734,11 @@
 #define GFX_SPECIAL_ARG_SETUP          8
 #define GFX_SPECIAL_ARG_PLAYING                9
 #define GFX_SPECIAL_ARG_DOOR           10
-#define GFX_SPECIAL_ARG_PREVIEW                11
-#define GFX_SPECIAL_ARG_CRUMBLED       12
+#define GFX_SPECIAL_ARG_PANEL          11
+#define GFX_SPECIAL_ARG_PREVIEW                12
+#define GFX_SPECIAL_ARG_CRUMBLED       13
 
-#define NUM_SPECIAL_GFX_ARGS           13
+#define NUM_SPECIAL_GFX_ARGS           14
 
 /* these additional definitions are currently only used for draw offsets */
 #define GFX_SPECIAL_ARG_INFO_MAIN      0
@@ -1884,12 +1885,13 @@
 #define GAME_MODE_SETUP                        8
 #define GAME_MODE_PLAYING              9
 #define GAME_MODE_PSEUDO_DOOR          10
-#define GAME_MODE_PSEUDO_PREVIEW       11
-#define GAME_MODE_PSEUDO_CRUMBLED      12
+#define GAME_MODE_PSEUDO_PANEL         11
+#define GAME_MODE_PSEUDO_PREVIEW       12
+#define GAME_MODE_PSEUDO_CRUMBLED      13
 
 /* there are no special config file suffixes for these modes */
-#define GAME_MODE_PSEUDO_TYPENAME      13
-#define GAME_MODE_QUIT                 14
+#define GAME_MODE_PSEUDO_TYPENAME      14
+#define GAME_MODE_QUIT                 15
 
 /* special definitions currently only used for custom artwork configuration */
 #define MUSIC_PREFIX_BACKGROUND                0

diff --git a/src/tools.c b/src/tools.c
index 074b232b5c2251f5e7ad52ed4fa19f996b6cd932..be4218ccd34e21522f1956c4e02a0013518496c3 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -5755,11 +5755,11 @@ int el2preimg(int element)
   return element_info[element].special_graphic[GFX_SPECIAL_ARG_PREVIEW];
 }
 
-int el2doorimg(int element)
+int el2panelimg(int element)
 {
   element = GFX_ELEMENT(element);
 
-  return element_info[element].special_graphic[GFX_SPECIAL_ARG_DOOR];
+  return element_info[element].special_graphic[GFX_SPECIAL_ARG_PANEL];
 }
 
 int font2baseimg(int font_nr)

diff --git a/src/tools.h b/src/tools.h
index 80f76114b4ed560f7de9164950e168f6b18cd060..795e4c257fcc0c2ecf381ca03f1d975b6433e9c7 100644 (file)
--- a/src/tools.h
+++ b/src/tools.h
@@ -185,7 +185,7 @@ int el2baseimg(int);
 int el2img(int);
 int el2edimg(int);
 int el2preimg(int);
-int el2doorimg(int);
+int el2panelimg(int);
 int font2baseimg(int);
 
 int getBeltNrFromBeltElement(int);