rnd-20020908-1-src

diff --git a/Makefile b/Makefile
index f4921768319dae2ee6a07e5b020a069d7cab3f18..9ba6b4d582f4029568e7e99ad321e421ab91d5f4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,8 @@ CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
-DEFAULT_TARGET = sdl
+DEFAULT_TARGET = x11
+# DEFAULT_TARGET = sdl
 
 all:
        @$(MAKE_CMD) TARGET=$(DEFAULT_TARGET)

diff --git a/src/conftime.h b/src/conftime.h
index 551ee18bfd88c51f24fe7179d1c243e8ac4207c3..23db0bd81ba90174055219ec13f5587d00afdaa9 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2002-09-07 15:04]"
+#define COMPILE_DATE_STRING "[2002-09-08 11:38]"

diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c
index 9d709f3aba55d9359ae99c636d5a60f483ad2ebc..77eb4718d0c7f049a5be0ea1f372627820fc91d3 100644 (file)
--- a/src/libgame/gadgets.c
+++ b/src/libgame/gadgets.c
@@ -63,6 +63,21 @@ static int getNewGadgetID()
   return id;
 }
 
+#if 0
+void DUMP_GADGET_MAP_STATE()
+{
+  struct GadgetInfo *gi = gadget_list_first_entry;
+
+  while (gi)
+  {
+    printf("-XXX-1-> '%s': %s\n",
+          gi->info_text, (gi->mapped ? "mapped" : "not mapped"));
+
+    gi = gi->next;
+  }
+}
+#endif
+
 static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my)
 {
   struct GadgetInfo *gi = gadget_list_first_entry;

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 498a96e89231d3c9de9fa47ad680ba1d948a6e67..f140d4605b1b4e5ffe2d6fd99d1cc6cc5d0e6f14 100644 (file)
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -1362,7 +1362,7 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
 {
   struct FileInfo *file_list;
   int num_suffix_list_entries = 0;
-  int list_pos = -1;
+  int list_pos = 0;
   int i, j;
 
   file_list = checked_calloc(num_file_list_entries * sizeof(struct FileInfo));
@@ -1373,9 +1373,9 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
   /* always start with reliable default values */
   for (i=0; i<num_file_list_entries; i++)
   {
-    file_list[list_pos].token = NULL;
-    file_list[list_pos].default_filename = NULL;
-    file_list[list_pos].filename = NULL;
+    file_list[i].token = NULL;
+    file_list[i].default_filename = NULL;
+    file_list[i].filename = NULL;
 
     if (num_suffix_list_entries > 0)
     {
@@ -1416,7 +1416,8 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
 
     if (is_file_entry)
     {
-      list_pos++;
+      if (i > 0)
+       list_pos++;
 
       if (list_pos >= num_file_list_entries)
        Error(ERR_EXIT, "inconsistant config list information -- please fix");
@@ -1464,8 +1465,11 @@ static void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
   {
     for (i=0; i<num_file_list_entries; i++)
     {
-      file_list[i].filename =
-       getStringCopy(getTokenValue(setup_file_list, file_list[i].token));
+      char *filename = getTokenValue(setup_file_list, file_list[i].token);
+
+      if (filename == NULL)
+       filename = file_list[i].default_filename;
+      file_list[i].filename = getStringCopy(filename);
 
       for (j=0; j<num_suffix_list_entries; j++)
       {
@@ -1629,7 +1633,7 @@ void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info)
     DrawInitText(draw_init[artwork_info->type].text, 120, FC_GREEN);
 
 #if 0
-  printf("DEBUG: reloading %d sounds ...\n", num_file_list_entries);
+  printf("DEBUG: reloading %d artwork files ...\n", num_file_list_entries);
 #endif
 
   for(i=0; i<num_file_list_entries; i++)
@@ -1637,10 +1641,7 @@ void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info)
     if (draw_init[artwork_info->type].do_it)
       DrawInitText(file_list[i].token, 150, FC_YELLOW);
 
-    if (file_list[i].filename)
-      LoadArtworkToList(artwork_info, file_list[i].filename, i);
-    else
-      LoadArtworkToList(artwork_info, file_list[i].default_filename, i);
+    LoadArtworkToList(artwork_info, file_list[i].filename, i);
   }
 
   draw_init[artwork_info->type].do_it = FALSE;