rnd-20030506-1-src

diff --git a/src/conftime.h b/src/conftime.h
index 615e0f6bd439b8d899f8e90d2073b25d17aca16b..97920059c9fb9e6123196552132914f3300f0b37 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2003-05-05 23:00]"
+#define COMPILE_DATE_STRING "[2003-05-06 23:53]"

diff --git a/src/editor.c b/src/editor.c
index 71b89a5f18f3c20602fcce2f20625bf1362bdde8..fc45e2b25d3ec719c683ead0497e001c8ec651b2 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -82,6 +82,8 @@
 
 #define ED_COUNT_CHANGE_DELAY_XPOS     (ED_SETTINGS_XPOS2 + 9 * MINI_TILEX)
 
+#define ED_COUNT_CHANGE_DELAY_XPOS     (ED_SETTINGS_XPOS2 + 9 * MINI_TILEX)
+
 #define ED_COUNTER_YSTART              (ED_SETTINGS_YPOS + 2 * TILEY)
 #define ED_COUNTER_YDISTANCE           (3 * MINI_TILEY)
 #define ED_COUNTER_YPOS(n)             (ED_COUNTER_YSTART + \
@@ -201,6 +203,10 @@
 #define ED_SELECTBOX_XSIZE             ED_WIN_COUNT_XSIZE
 #define ED_SELECTBOX_YSIZE             ED_WIN_COUNT_YSIZE
 
+#define ED_SELECTBOX_CHANGE_UNITS_XPOS (ED_SETTINGS_XPOS2 + \
+                                        ED_CHECKBUTTON_XSIZE + \
+                                        2 * ED_GADGET_DISTANCE)
+
 #define ED_TEXTBUTTON_XPOS             ED_WIN_COUNT_XPOS
 #define ED_TEXTBUTTON_YPOS             (ED_WIN_COUNT_YPOS + \
                                         2 * (2 + ED_WIN_COUNT_YSIZE))
@@ -311,10 +317,11 @@
 /* selectbox identifiers */
 #define GADGET_ID_SELECTBOX_FIRST      (GADGET_ID_TEXT_INPUT_FIRST + 2)
 
-#define GADGET_ID_CUSTOM_CHANGE_CAUSE  (GADGET_ID_SELECTBOX_FIRST + 0)
+#define GADGET_ID_CHANGE_TIME_UNITS    (GADGET_ID_SELECTBOX_FIRST + 0)
+#define GADGET_ID_CHANGE_CAUSE         (GADGET_ID_SELECTBOX_FIRST + 1)
 
 /* textbutton identifiers */
-#define GADGET_ID_TEXTBUTTON_FIRST     (GADGET_ID_SELECTBOX_FIRST + 1)
+#define GADGET_ID_TEXTBUTTON_FIRST     (GADGET_ID_SELECTBOX_FIRST + 2)
 
 #define GADGET_ID_PROPERTIES_INFO      (GADGET_ID_TEXTBUTTON_FIRST + 0)
 #define GADGET_ID_PROPERTIES_CONFIG    (GADGET_ID_TEXTBUTTON_FIRST + 1)
@@ -428,9 +435,13 @@
 #define ED_TEXTINPUT_ID_LEVEL_LAST     ED_TEXTINPUT_ID_LEVEL_AUTHOR
 
 /* values for selectbox gadgets */
-#define ED_SELECTBOX_ID_CUSTOM_CHANGE_CAUSE    0
+#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS      0
+#define ED_SELECTBOX_ID_CHANGE_CAUSE           1
+
+#define ED_NUM_SELECTBOX                       2
 
-#define ED_NUM_SELECTBOX                       1
+#define ED_SELECTBOX_ID_CHANGE_FIRST   ED_SELECTBOX_ID_CHANGE_TIME_UNITS
+#define ED_SELECTBOX_ID_CHANGE_LAST    ED_SELECTBOX_ID_CHANGE_CAUSE
 
 /* values for textbutton gadgets */
 #define ED_TEXTBUTTON_ID_PROPERTIES_INFO       0
@@ -657,7 +668,7 @@ static struct
     GADGET_ID_CHANGE_DELAY_FIX_DOWN,   GADGET_ID_CHANGE_DELAY_FIX_UP,
     GADGET_ID_CHANGE_DELAY_FIX_TEXT,
     &custom_element_change.delay_fixed,
-    NULL,                              "seconds (fixed)"
+    NULL,                              "units (fixed)"
   },
   {
     ED_COUNT_CHANGE_DELAY_XPOS,                ED_COUNTER_YPOS2(6),
@@ -665,7 +676,7 @@ static struct
     GADGET_ID_CHANGE_DELAY_RND_DOWN,   GADGET_ID_CHANGE_DELAY_RND_UP,
     GADGET_ID_CHANGE_DELAY_RND_TEXT,
     &custom_element_change.delay_random,
-    NULL,                              "seconds (random)"
+    NULL,                              "units (random)"
   }
 };
 
@@ -694,6 +705,14 @@ static struct
   }
 };
 
+static struct ValueTextInfo options_change_time_units[] =
+{
+  { 1, "frames"                },
+  { 50,        "seconds"               },
+  { -1,        NULL                    }
+};
+static int index_change_time_units = 0;
+
 static struct ValueTextInfo options_change_cause[] =
 {
   { 1, "specified delay"       },
@@ -703,23 +722,32 @@ static struct ValueTextInfo options_change_cause[] =
   { 5, "pressed by player"     },
   { -1,        NULL                    }
 };
-static int index_change_cause = 0;
+static int index_change_cause = 0, value_change_cause = 0;
 
 static struct
 {
   int x, y;
   int gadget_id;
-  int size;
+  int size;    /* size of selectbox (chars) or '0' (dynamically determined) */
   struct ValueTextInfo *options;
-  int *index;
+  int *index, *value;
   char *text, *infotext;
 } selectbox_info[ED_NUM_SELECTBOX] =
 {
+  {
+    ED_SELECTBOX_CHANGE_UNITS_XPOS,    ED_COUNTER_YPOS2(7),
+    GADGET_ID_CHANGE_TIME_UNITS,
+    0,
+    options_change_time_units, &index_change_time_units,
+    &custom_element_change.delay_frames,
+    "time units measured in", "time units for change"
+  },
   {
     ED_SETTINGS_XPOS,                  ED_COUNTER_YPOS(8),
-    GADGET_ID_CUSTOM_CHANGE_CAUSE,
-    17,
+    GADGET_ID_CHANGE_CAUSE,
+    0,
     options_change_cause, &index_change_cause,
+    &value_change_cause,
     "test:", "test-selectbox entry"
   },
 };
@@ -1013,6 +1041,7 @@ static int new_element3 = EL_SAND;
 /* forward declaration for internal use */
 static void ModifyEditorCounter(int, int);
 static void ModifyEditorCounterLimits(int, int, int);
+static void ModifyEditorSelectbox(int, int);
 static void DrawDrawingWindow();
 static void DrawLevelInfoWindow();
 static void DrawPropertiesWindow();
@@ -2456,30 +2485,43 @@ static void CreateTextInputGadgets()
 static void CreateSelectboxGadgets()
 {
   int max_infotext_len = getMaxInfoTextLength();
-  int i;
+  int i, j;
 
   for (i=0; i<ED_NUM_SELECTBOX; i++)
   {
     Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
     int gd_x, gd_y;
+    int xoffset;
     struct GadgetInfo *gi;
     unsigned long event_mask;
     char infotext[MAX_OUTPUT_LINESIZE + 1];
     int id = selectbox_info[i].gadget_id;
 
+    /* (we cannot use -1 for uninitialized values if we directly compare
+       with results from strlen(), because the '<' and '>' operation will
+       implicitely cast -1 to an unsigned integer value!) */
+
+    if (selectbox_info[i].size == 0)   /* dynamically determined */
+      for (j=0; selectbox_info[i].options[j].text != NULL; j++)
+       if (strlen(selectbox_info[i].options[j].text) > selectbox_info[i].size)
+         selectbox_info[i].size = strlen(selectbox_info[i].options[j].text);
+
     event_mask = GD_EVENT_RELEASED |
       GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
 
     gd_x = DOOR_GFX_PAGEX4 + ED_SELECTBOX_XPOS;
     gd_y = DOOR_GFX_PAGEY1 + ED_SELECTBOX_YPOS;
 
+    xoffset = (getFontWidth(FONT_TEXT_1) * strlen(selectbox_info[i].text) +
+              2 * ED_GADGET_DISTANCE);
+
     sprintf(infotext, "Select %s", selectbox_info[i].infotext);
     infotext[max_infotext_len] = '\0';
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
                      GDI_INFO_TEXT, infotext,
-                     GDI_X, SX + selectbox_info[i].x,
+                     GDI_X, SX + selectbox_info[i].x + xoffset,
                      GDI_Y, SY + selectbox_info[i].y,
                      GDI_TYPE, GD_TYPE_SELECTBOX,
                      GDI_SELECTBOX_OPTIONS, selectbox_info[i].options,
@@ -3132,6 +3174,20 @@ static void ModifyEditorCounterLimits(int counter_id, int min, int max)
   ModifyGadget(gi, GDI_NUMBER_MIN, min, GDI_NUMBER_MAX, max, GDI_END);
 }
 
+static void ModifyEditorSelectbox(int selectbox_id, int new_value)
+{
+  int gadget_id = selectbox_info[selectbox_id].gadget_id;
+  struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+  int new_index_value = 0;
+  int i;
+
+  for(i=0; selectbox_info[selectbox_id].options[i].text != NULL; i++)
+    if (selectbox_info[selectbox_id].options[i].value == new_value)
+      new_index_value = i;
+
+  ModifyGadget(gi, GDI_SELECTBOX_INDEX, new_index_value, GDI_END);
+}
+
 static void PickDrawingElement(int button, int element)
 {
   if (button < 1 || button > 3)
@@ -3968,17 +4024,23 @@ static void DrawPropertiesAdvanced()
 
   DrawCustomChangedArea();
 
-  /* draw selectbox gadget */
-  i = ED_SELECTBOX_ID_CUSTOM_CHANGE_CAUSE;
-  x = selectbox_info[i].x + xoffset_right2;
-  y = selectbox_info[i].y + yoffset_right2;
+  /* draw selectbox gadgets */
+  for (i=ED_SELECTBOX_ID_CHANGE_FIRST; i<=ED_SELECTBOX_ID_CHANGE_LAST; i++)
+  {
+    int yoffset = ED_BORDER_SIZE;
 
-  selectbox_info[i].index = &index_change_cause;
+    x = selectbox_info[i].x;
+    y = selectbox_info[i].y + yoffset;
 
-  DrawTextF(x, y, FONT_TEXT_1, selectbox_info[i].text);
-  ModifyGadget(level_editor_gadget[selectbox_info[i].gadget_id],
-              GDI_SELECTBOX_INDEX, *selectbox_info[i].index, GDI_END);
-  MapSelectboxGadget(i);
+    DrawTextF(x, y, FONT_TEXT_1, selectbox_info[i].text);
+#if 1
+    ModifyEditorSelectbox(i, *selectbox_info[i].value);
+#else
+    ModifyGadget(level_editor_gadget[selectbox_info[i].gadget_id],
+                GDI_SELECTBOX_INDEX, *selectbox_info[i].index, GDI_END);
+#endif
+    MapSelectboxGadget(i);
+  }
 }
 
 static void DrawPropertiesWindow()
@@ -4944,6 +5006,12 @@ static void HandleSelectboxGadgets(struct GadgetInfo *gi)
   int type_id = gi->custom_type_id;
 
   *selectbox_info[type_id].index = gi->selectbox.index;
+  *selectbox_info[type_id].value =
+    selectbox_info[type_id].options[gi->selectbox.index].value;
+
+  if (type_id >= ED_SELECTBOX_ID_CHANGE_FIRST &&
+      type_id <= ED_SELECTBOX_ID_CHANGE_LAST)
+    CopyCustomElementPropertiesToGame(properties_element);
 
 #if 0
   printf("Selected text value: '%s' [%d]\n",

diff --git a/src/game.c b/src/game.c
index 666149c277e1194c35a72586529cc89dfe84ec67..7436b1d9ae07ca7823359240c53ea48b72d273a3 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -702,7 +702,7 @@ static void InitGameEngine()
 
     if (HAS_CHANGE_EVENT(element, CE_DELAY_FIXED))
       changing_element[element].change_delay +=
-       change->delay_fixed * FRAMES_PER_SECOND;
+       change->delay_fixed * change->delay_frames;
 
     if (HAS_CHANGE_EVENT(element, CE_DELAY_RANDOM));
     /* random frame delay added at runtime for each element individually */
@@ -4565,8 +4565,9 @@ static void ChangeElement(int x, int y)
     {
       int i = element - EL_CUSTOM_START;
       int max_random_delay = level.custom_element[i].change.delay_random;
+      int delay_frames = level.custom_element[i].change.delay_frames;
 
-      MovDelay[x][y] += RND(max_random_delay * FRAMES_PER_SECOND);
+      MovDelay[x][y] += RND(max_random_delay * delay_frames);
     }
 
     ResetGfxAnimation(x, y);

diff --git a/src/main.h b/src/main.h
index bccf5762a1f0640ad8cc4e3ebd8a033e07baffff..d3ae1526b1be073701b55fa49b571639ea8c251c 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1018,6 +1018,7 @@ struct CustomElementChangeInfo
 
   int delay_fixed;     /* added frame delay before changed (fixed) */
   int delay_random;    /* added frame delay before changed (random) */
+  int delay_frames;    /* either 1 (frames) or 50 (seconds; 50 fps) */
 };
 
 struct CustomElementInfo