rnd-20031129-1-src

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index e65f387a3c461528dcd31064b5eaf06cf1d620bc..cb4c6a605a173139931c8203c7f39353b77275a6 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -3236,30 +3236,25 @@ void LoadDemoAnimText()
   int i;
 
   if (demo_anim_text != NULL)
-    freeSetupFileList(demo_anim_text);
+    freeSetupFileHash(demo_anim_text);
 
-  if ((demo_anim_text = loadSetupFileList(filename)) == NULL)
+  if ((demo_anim_text = loadSetupFileHash(filename)) == NULL)
   {
     /* use reliable default values from static configuration */
-    SetupFileList *insert_ptr;
-
-    insert_ptr = demo_anim_text =
-      newSetupFileList(demo_anim_text_config[0].token,
-                      demo_anim_text_config[0].value);
+    demo_anim_text = newSetupFileHash();
 
-    for (i=1; demo_anim_text_config[i].token; i++)
-      insert_ptr = addListEntry(insert_ptr,
-                               demo_anim_text_config[i].token,
-                               demo_anim_text_config[i].value);
+    for (i=0; demo_anim_text_config[i].token; i++)
+      setHashEntry(demo_anim_text, demo_anim_text_config[i].token,
+                  demo_anim_text_config[i].value);
   }
 
 #if 0
   /* TEST ONLY */
+  BEGIN_HASH_ITERATION(demo_anim_text, itr)
   {
-    SetupFileList *list;
-
-    for (list = demo_anim_text; list != NULL; list = list->next)
-      printf("::: '%s' => '%s'\n", list->token, list->value);
+    printf("::: '%s' => '%s'\n",
+          HASH_ITERATION_TOKEN(itr), HASH_ITERATION_VALUE(itr));
   }
+  END_HASH_ITERATION(hash, itr)
 #endif
 }