rnd-20070404-2-src

* cleanup of game panel elements (some elements were not really needed)
* added displaying of gravity state (on/off) as new game panel control

diff --git a/ChangeLog b/ChangeLog
index 9e06c9d2a96647200841f4373e02ae8ed766c948..e78395efe58b81fc3bf3b7d98854c753e8c78e53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-04
+       * cleanup of game panel elements (some elements were not really needed)
+       * added displaying of gravity state (on/off) as new game panel control
+
 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

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 8bbf6186b89c45af879db879d00be07003e09a0e..1da4c96d663b5cc861c746ebd2f8a234a86bca8f 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -5648,18 +5648,6 @@ struct ConfigInfo image_config[] =
   { "game.panel.exit.x",                       "-1"                    },
   { "game.panel.exit.y",                       "-1"                    },
   { "game.panel.exit.tile_size",               "16"                    },
-  { "game.panel.em_exit.x",                    "-1"                    },
-  { "game.panel.em_exit.y",                    "-1"                    },
-  { "game.panel.em_exit.tile_size",            "16"                    },
-  { "game.panel.sp_exit.x",                    "-1"                    },
-  { "game.panel.sp_exit.y",                    "-1"                    },
-  { "game.panel.sp_exit.tile_size",            "16"                    },
-  { "game.panel.steel_exit.x",                 "-1"                    },
-  { "game.panel.steel_exit.y",                 "-1"                    },
-  { "game.panel.steel_exit.tile_size",         "16"                    },
-  { "game.panel.em_steel_exit.x",              "-1"                    },
-  { "game.panel.em_steel_exit.y",              "-1"                    },
-  { "game.panel.em_steel_exit.tile_size",      "16"                    },
 
   { "game.panel.emc_magic_ball.x",             "-1"                    },
   { "game.panel.emc_magic_ball.y",             "-1"                    },
@@ -5790,12 +5778,14 @@ struct ConfigInfo image_config[] =
   { "game.panel.magic_wall_time.valign",       "top"                   },
   { "game.panel.magic_wall_time.digits",       "-1"                    },
   { "game.panel.magic_wall_time.font",         "font.text_2"           },
-  { "game.panel.bd_magic_wall.x",              "-1"                    },
-  { "game.panel.bd_magic_wall.y",              "-1"                    },
-  { "game.panel.bd_magic_wall.tile_size",      "16"                    },
-  { "game.panel.dc_magic_wall.x",              "-1"                    },
-  { "game.panel.dc_magic_wall.y",              "-1"                    },
-  { "game.panel.dc_magic_wall.tile_size",      "16"                    },
+
+  { "game.panel.gravity_state.x",              "-1"                    },
+  { "game.panel.gravity_state.y",              "-1"                    },
+  { "game.panel.gravity_state.align",          "left"                  },
+  { "game.panel.gravity_state.valign",         "top"                   },
+  { "game.panel.gravity_state.chars",          "-1"                    },
+  { "game.panel.gravity_state.font",           "font.text_1"           },
+  { "game.panel.gravity_state.font_active",    "font.text_2"           },
 
   { "game.panel.player_name.x",                        "-1"                    },
   { "game.panel.player_name.y",                        "-1"                    },

diff --git a/src/conf_var.c b/src/conf_var.c
index 58cae465bb0a06fbee78fa75ecc571b802647be5..bf4e4a1095c9512c5436ef7c497b3139d624bc92 100644 (file)
--- a/src/conf_var.c
+++ b/src/conf_var.c
@@ -2576,54 +2576,6 @@ struct TokenIntPtrInfo image_config_vars[] =
     "game.panel.exit.tile_size",
     &game.panel.exit.size
   },
-  {
-    "game.panel.em_exit.x",
-    &game.panel.em_exit.x
-  },
-  {
-    "game.panel.em_exit.y",
-    &game.panel.em_exit.y
-  },
-  {
-    "game.panel.em_exit.tile_size",
-    &game.panel.em_exit.size
-  },
-  {
-    "game.panel.sp_exit.x",
-    &game.panel.sp_exit.x
-  },
-  {
-    "game.panel.sp_exit.y",
-    &game.panel.sp_exit.y
-  },
-  {
-    "game.panel.sp_exit.tile_size",
-    &game.panel.sp_exit.size
-  },
-  {
-    "game.panel.steel_exit.x",
-    &game.panel.steel_exit.x
-  },
-  {
-    "game.panel.steel_exit.y",
-    &game.panel.steel_exit.y
-  },
-  {
-    "game.panel.steel_exit.tile_size",
-    &game.panel.steel_exit.size
-  },
-  {
-    "game.panel.em_steel_exit.x",
-    &game.panel.em_steel_exit.x
-  },
-  {
-    "game.panel.em_steel_exit.y",
-    &game.panel.em_steel_exit.y
-  },
-  {
-    "game.panel.em_steel_exit.tile_size",
-    &game.panel.em_steel_exit.size
-  },
   {
     "game.panel.emc_magic_ball.x",
     &game.panel.emc_magic_ball.x
@@ -3093,28 +3045,32 @@ struct TokenIntPtrInfo image_config_vars[] =
     &game.panel.magic_wall_time.font
   },
   {
-    "game.panel.bd_magic_wall.x",
-    &game.panel.bd_magic_wall.x
+    "game.panel.gravity_state.x",
+    &game.panel.gravity_state.x
+  },
+  {
+    "game.panel.gravity_state.y",
+    &game.panel.gravity_state.y
   },
   {
-    "game.panel.bd_magic_wall.y",
-    &game.panel.bd_magic_wall.y
+    "game.panel.gravity_state.align",
+    &game.panel.gravity_state.align
   },
   {
-    "game.panel.bd_magic_wall.tile_size",
-    &game.panel.bd_magic_wall.size
+    "game.panel.gravity_state.valign",
+    &game.panel.gravity_state.valign
   },
   {
-    "game.panel.dc_magic_wall.x",
-    &game.panel.dc_magic_wall.x
+    "game.panel.gravity_state.chars",
+    &game.panel.gravity_state.size
   },
   {
-    "game.panel.dc_magic_wall.y",
-    &game.panel.dc_magic_wall.y
+    "game.panel.gravity_state.font",
+    &game.panel.gravity_state.font
   },
   {
-    "game.panel.dc_magic_wall.tile_size",
-    &game.panel.dc_magic_wall.size
+    "game.panel.gravity_state.font_active",
+    &game.panel.gravity_state.font_alt
   },
   {
     "game.panel.player_name.x",

diff --git a/src/conftime.h b/src/conftime.h
index 1319bb5c899b1048c0e5cd45d387bb72f9cba3cf..1d07204b4df61006e3ffe1f332efe6f4c40cb7a0 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2007-04-03 23:50"
+#define COMPILE_DATE_STRING "2007-04-04 23:09"

diff --git a/src/game.c b/src/game.c
index 33386d84ad1c9543b85798f4970e4473005db006..6b687642f6e6950495f39241f635096d53df6946 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -170,46 +170,41 @@
 #define GAME_CONTROL_SHIELD_DEADLY             36
 #define GAME_CONTROL_SHIELD_DEADLY_TIME                37
 #define GAME_CONTROL_EXIT                      38
-#define GAME_CONTROL_EM_EXIT                   39
-#define GAME_CONTROL_SP_EXIT                   40
-#define GAME_CONTROL_STEEL_EXIT                        41
-#define GAME_CONTROL_EM_STEEL_EXIT             42
-#define GAME_CONTROL_EMC_MAGIC_BALL            43
-#define GAME_CONTROL_EMC_MAGIC_BALL_SWITCH     44
-#define GAME_CONTROL_LIGHT_SWITCH              45
-#define GAME_CONTROL_LIGHT_SWITCH_TIME         46
-#define GAME_CONTROL_TIMEGATE_SWITCH           47
-#define GAME_CONTROL_TIMEGATE_SWITCH_TIME      48
-#define GAME_CONTROL_SWITCHGATE_SWITCH         49
-#define GAME_CONTROL_EMC_LENSES                        50
-#define GAME_CONTROL_EMC_LENSES_TIME           51
-#define GAME_CONTROL_EMC_MAGNIFIER             52
-#define GAME_CONTROL_EMC_MAGNIFIER_TIME                53
-#define GAME_CONTROL_BALLOON_SWITCH            54
-#define GAME_CONTROL_DYNABOMB_NUMBER           55
-#define GAME_CONTROL_DYNABOMB_SIZE             56
-#define GAME_CONTROL_DYNABOMB_POWER            57
-#define GAME_CONTROL_PENGUINS                  58
-#define GAME_CONTROL_SOKOBAN_OBJECTS           59
-#define GAME_CONTROL_SOKOBAN_FIELDS            60
-#define GAME_CONTROL_ROBOT_WHEEL               61
-#define GAME_CONTROL_CONVEYOR_BELT_1           62
-#define GAME_CONTROL_CONVEYOR_BELT_1_SWITCH    63
-#define GAME_CONTROL_CONVEYOR_BELT_2           64
-#define GAME_CONTROL_CONVEYOR_BELT_2_SWITCH    65
-#define GAME_CONTROL_CONVEYOR_BELT_3           66
-#define GAME_CONTROL_CONVEYOR_BELT_3_SWITCH    67
-#define GAME_CONTROL_CONVEYOR_BELT_4           68
-#define GAME_CONTROL_CONVEYOR_BELT_4_SWITCH    69
-#define GAME_CONTROL_MAGIC_WALL                        70
-#define GAME_CONTROL_MAGIC_WALL_TIME           71
-#define GAME_CONTROL_BD_MAGIC_WALL             72
-#define GAME_CONTROL_DC_MAGIC_WALL             73
-#define GAME_CONTROL_PLAYER_NAME               74
-#define GAME_CONTROL_LEVEL_NAME                        75
-#define GAME_CONTROL_LEVEL_AUTHOR              76
-
-#define NUM_GAME_CONTROLS                      77
+#define GAME_CONTROL_EMC_MAGIC_BALL            39
+#define GAME_CONTROL_EMC_MAGIC_BALL_SWITCH     40
+#define GAME_CONTROL_LIGHT_SWITCH              41
+#define GAME_CONTROL_LIGHT_SWITCH_TIME         42
+#define GAME_CONTROL_TIMEGATE_SWITCH           43
+#define GAME_CONTROL_TIMEGATE_SWITCH_TIME      44
+#define GAME_CONTROL_SWITCHGATE_SWITCH         45
+#define GAME_CONTROL_EMC_LENSES                        46
+#define GAME_CONTROL_EMC_LENSES_TIME           47
+#define GAME_CONTROL_EMC_MAGNIFIER             48
+#define GAME_CONTROL_EMC_MAGNIFIER_TIME                49
+#define GAME_CONTROL_BALLOON_SWITCH            50
+#define GAME_CONTROL_DYNABOMB_NUMBER           51
+#define GAME_CONTROL_DYNABOMB_SIZE             52
+#define GAME_CONTROL_DYNABOMB_POWER            53
+#define GAME_CONTROL_PENGUINS                  54
+#define GAME_CONTROL_SOKOBAN_OBJECTS           55
+#define GAME_CONTROL_SOKOBAN_FIELDS            56
+#define GAME_CONTROL_ROBOT_WHEEL               57
+#define GAME_CONTROL_CONVEYOR_BELT_1           58
+#define GAME_CONTROL_CONVEYOR_BELT_1_SWITCH    59
+#define GAME_CONTROL_CONVEYOR_BELT_2           60
+#define GAME_CONTROL_CONVEYOR_BELT_2_SWITCH    61
+#define GAME_CONTROL_CONVEYOR_BELT_3           62
+#define GAME_CONTROL_CONVEYOR_BELT_3_SWITCH    63
+#define GAME_CONTROL_CONVEYOR_BELT_4           64
+#define GAME_CONTROL_CONVEYOR_BELT_4_SWITCH    65
+#define GAME_CONTROL_MAGIC_WALL                        66
+#define GAME_CONTROL_MAGIC_WALL_TIME           67
+#define GAME_CONTROL_GRAVITY_STATE             68
+#define GAME_CONTROL_PLAYER_NAME               69
+#define GAME_CONTROL_LEVEL_NAME                        70
+#define GAME_CONTROL_LEVEL_AUTHOR              71
+
+#define NUM_GAME_CONTROLS                      72
 
 int game_control_value[NUM_GAME_CONTROLS];
 int last_game_control_value[NUM_GAME_CONTROLS];
@@ -419,26 +414,6 @@ static struct GameControlInfo game_controls[] =
     &game.panel.exit,
     TYPE_ELEMENT,
   },
-  {
-    GAME_CONTROL_EM_EXIT,
-    &game.panel.em_exit,
-    TYPE_ELEMENT,
-  },
-  {
-    GAME_CONTROL_SP_EXIT,
-    &game.panel.sp_exit,
-    TYPE_ELEMENT,
-  },
-  {
-    GAME_CONTROL_STEEL_EXIT,
-    &game.panel.steel_exit,
-    TYPE_ELEMENT,
-  },
-  {
-    GAME_CONTROL_EM_STEEL_EXIT,
-    &game.panel.em_steel_exit,
-    TYPE_ELEMENT,
-  },
   {
     GAME_CONTROL_EMC_MAGIC_BALL,
     &game.panel.emc_magic_ball,
@@ -585,14 +560,9 @@ static struct GameControlInfo game_controls[] =
     TYPE_INTEGER,
   },
   {
-    GAME_CONTROL_BD_MAGIC_WALL,
-    &game.panel.bd_magic_wall,
-    TYPE_ELEMENT,
-  },
-  {
-    GAME_CONTROL_DC_MAGIC_WALL,
-    &game.panel.dc_magic_wall,
-    TYPE_ELEMENT,
+    GAME_CONTROL_GRAVITY_STATE,
+    &game.panel.gravity_state,
+    TYPE_STRING,
   },
   {
     GAME_CONTROL_PLAYER_NAME,
@@ -1858,6 +1828,9 @@ void UpdateGameControlValues()
   int time = (level.time == 0 ? TimePlayed : TimeLeft);
   int score = (local_player->LevelSolved ? local_player->score_final :
               local_player->score);
+  int exit_closed = (local_player->gems_still_needed > 0 ||
+                    local_player->sokobanfields_still_needed > 0 ||
+                    local_player->lights_still_needed > 0);
 
   game_control_value[GAME_CONTROL_LEVEL_NUMBER] = level_nr;
   game_control_value[GAME_CONTROL_GEMS] = local_player->gems_still_needed;
@@ -1933,28 +1906,15 @@ void UpdateGameControlValues()
   game_control_value[GAME_CONTROL_SHIELD_DEADLY_TIME] =
     local_player->shield_deadly_time_left;
 
-  if (local_player->gems_still_needed > 0 ||
-      local_player->sokobanfields_still_needed > 0 ||
-      local_player->lights_still_needed > 0)
-  {
-    game_control_value[GAME_CONTROL_EXIT]          = EL_EXIT_CLOSED;
-    game_control_value[GAME_CONTROL_EM_EXIT]       = EL_EM_EXIT_CLOSED;
-    game_control_value[GAME_CONTROL_SP_EXIT]       = EL_SP_EXIT_CLOSED;
-    game_control_value[GAME_CONTROL_STEEL_EXIT]    = EL_STEEL_EXIT_CLOSED;
-    game_control_value[GAME_CONTROL_EM_STEEL_EXIT] = EL_EM_STEEL_EXIT_CLOSED;
-  }
-  else
-  {
-    game_control_value[GAME_CONTROL_EXIT]          = EL_EXIT_OPEN;
-    game_control_value[GAME_CONTROL_EM_EXIT]       = EL_EM_EXIT_OPEN;
-    game_control_value[GAME_CONTROL_SP_EXIT]       = EL_SP_EXIT_OPEN;
-    game_control_value[GAME_CONTROL_STEEL_EXIT]    = EL_STEEL_EXIT_OPEN;
-    game_control_value[GAME_CONTROL_EM_STEEL_EXIT] = EL_EM_STEEL_EXIT_OPEN;
-  }
+  game_control_value[GAME_CONTROL_EXIT] =
+    (exit_closed ? EL_EXIT_CLOSED : EL_EXIT_OPEN);
 
   /* !!! TODO !!! */
-  game_control_value[GAME_CONTROL_EMC_MAGIC_BALL] = EL_UNDEFINED;
-  game_control_value[GAME_CONTROL_EMC_MAGIC_BALL_SWITCH] = EL_UNDEFINED;
+  game_control_value[GAME_CONTROL_EMC_MAGIC_BALL] =
+    (game.ball_state ? EL_EMC_MAGIC_BALL_ACTIVE : EL_EMC_MAGIC_BALL);
+  game_control_value[GAME_CONTROL_EMC_MAGIC_BALL_SWITCH] =
+    (game.ball_state ? EL_EMC_MAGIC_BALL_SWITCH_ACTIVE :
+     EL_EMC_MAGIC_BALL_SWITCH);
 
   game_control_value[GAME_CONTROL_LIGHT_SWITCH] =
     (game.light_time_left > 0 ? EL_LIGHT_SWITCH_ACTIVE : EL_LIGHT_SWITCH);
@@ -1966,7 +1926,8 @@ void UpdateGameControlValues()
     game.timegate_time_left;
 
   /* !!! TODO !!! */
-  game_control_value[GAME_CONTROL_SWITCHGATE_SWITCH] = EL_UNDEFINED;
+  game_control_value[GAME_CONTROL_SWITCHGATE_SWITCH] =
+    EL_SWITCHGATE_SWITCH_UP + game.switchgate_pos;
 
   game_control_value[GAME_CONTROL_EMC_LENSES] =
     (game.lenses_time_left > 0 ? EL_EMC_LENSES : EL_EMPTY);
@@ -2012,11 +1973,15 @@ void UpdateGameControlValues()
   game_control_value[GAME_CONTROL_CONVEYOR_BELT_4_SWITCH] = EL_UNDEFINED;
 
   /* !!! TODO !!! */
-  game_control_value[GAME_CONTROL_MAGIC_WALL] = EL_UNDEFINED;
-  game_control_value[GAME_CONTROL_MAGIC_WALL_TIME] =
-    game.magic_wall_time_left;
-  game_control_value[GAME_CONTROL_BD_MAGIC_WALL] = EL_UNDEFINED;
-  game_control_value[GAME_CONTROL_DC_MAGIC_WALL] = EL_UNDEFINED;
+  game_control_value[GAME_CONTROL_MAGIC_WALL] =
+    (game.magic_wall_active ? EL_MAGIC_WALL_ACTIVE : EL_MAGIC_WALL);
+  game_control_value[GAME_CONTROL_MAGIC_WALL_TIME] = game.magic_wall_time_left;
+
+#if USE_PLAYER_GRAVITY
+  game_control_value[GAME_CONTROL_GRAVITY_STATE] = local_player->gravity;
+#else
+  game_control_value[GAME_CONTROL_GRAVITY_STATE] = game.gravity;
+#endif
 
   game_control_value[GAME_CONTROL_PLAYER_NAME] = 0;
   game_control_value[GAME_CONTROL_LEVEL_NAME] = 0;
@@ -2110,14 +2075,42 @@ void DisplayGameControlValues()
     }
     else if (type == TYPE_STRING)
     {
-      char *s = (nr == GAME_CONTROL_PLAYER_NAME  ? setup.player_name :
-                nr == GAME_CONTROL_LEVEL_NAME   ? level.name :
-                nr == GAME_CONTROL_LEVEL_AUTHOR ? level.author : NULL);
+      boolean active = (value != 0);
+      char *state_normal = "off";
+      char *state_active = "on";
+      char *state = (active ? state_active : state_normal);
+      char *s = (nr == GAME_CONTROL_GRAVITY_STATE ? state :
+                nr == GAME_CONTROL_PLAYER_NAME   ? setup.player_name :
+                nr == GAME_CONTROL_LEVEL_NAME    ? level.name :
+                nr == GAME_CONTROL_LEVEL_AUTHOR  ? level.author : NULL);
+
+      if (nr == GAME_CONTROL_GRAVITY_STATE)
+      {
+       int font1 = pos->font;          /* (used for normal state) */
+       int font2 = pos->font_alt;      /* (used for active state) */
+       int size1 = strlen(state_normal);
+       int size2 = strlen(state_active);
+       int width1 = size1 * getFontWidth(font1);
+       int width2 = size2 * getFontWidth(font2);
+       int max_width = MAX(width1, width2);
+       int max_height = MAX(getFontHeight(font1), getFontHeight(font2));
+
+       pos->width = max_width;
+
+       /* clear background for values that may have changed its size */
+       ClearRectangleOnBackground(drawto, PANEL_XPOS(pos), PANEL_YPOS(pos),
+                                  max_width, max_height);
+
+       font = (active ? font2 : font1);
+      }
 
       if (s != NULL)
       {
        char *s_cut = getStringCopyN(s, size);
 
+       size = strlen(s_cut);   /* string size may be smaller than "chars" */
+       pos->width = size * getFontWidth(font);
+
        DrawText(PANEL_XPOS(pos), PANEL_YPOS(pos), s_cut, font);
 
        free(s_cut);

diff --git a/src/game.h b/src/game.h
index 98bdda1df6f56ea4d96bf515b708e02a59497f69..179ee56dbb4e05b13b5d76d356ebae6af69a2291 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -57,10 +57,6 @@ struct GamePanelInfo
   struct TextPosInfo shield_deadly;
   struct TextPosInfo shield_deadly_time;
   struct TextPosInfo exit;
-  struct TextPosInfo em_exit;
-  struct TextPosInfo sp_exit;
-  struct TextPosInfo steel_exit;
-  struct TextPosInfo em_steel_exit;
   struct TextPosInfo emc_magic_ball;
   struct TextPosInfo emc_magic_ball_switch;
   struct TextPosInfo light_switch;
@@ -90,8 +86,7 @@ struct GamePanelInfo
   struct TextPosInfo conveyor_belt_4_switch;
   struct TextPosInfo magic_wall;
   struct TextPosInfo magic_wall_time;
-  struct TextPosInfo bd_magic_wall;
-  struct TextPosInfo dc_magic_wall;
+  struct TextPosInfo gravity_state;
   struct TextPosInfo player_name;
   struct TextPosInfo level_name;
   struct TextPosInfo level_author;

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index d28b48dff26ceb9580949eaf674b14f990e3f686..95c5dfd3b2b5ed2464ccbf82e443189aa04d2f09 100644 (file)
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -567,7 +567,7 @@ char *getStringCopyN(char *s, int n)
 
   s_copy = checked_malloc(s_len + 1);
   strncpy(s_copy, s, s_len);
-  s[s_len] = '\0';
+  s_copy[s_len] = '\0';
 
   return s_copy;
 }