improved function to dump identifiers for all gadgets on current screen

diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c
index 6a3a9ac2145d786483a7251a566b31f65086d97c..244db6ea8852b4a4df027f3ffbc95848b635210d 100644 (file)
--- a/src/libgame/gadgets.c
+++ b/src/libgame/gadgets.c
@@ -2278,13 +2278,23 @@ void DumpGadgetIdentifiers()
 {
   struct GadgetInfo *gi;
 
 {
   struct GadgetInfo *gi;
 

-  printf("Gadgets on current screen (any prefix 'gfx.' can be omitted):\n");
+  Print("Gadgets on current screen:\n");

 
   for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next)
 
   for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next)

+  {

     if (gi->mapped && gi->image_id != -1)
     if (gi->mapped && gi->image_id != -1)

-      printf("- '%s'\n", getTokenFromImageID(gi->image_id));
+    {
+      char *token = getTokenFromImageID(gi->image_id);
+      char *prefix = "gfx.";
+
+      if (strPrefix(token, prefix))
+       token = &token[strlen(prefix)];
+
+      Print("- '%s'\n", token);
+    }
+  }

 
 

-  printf("Done.\n");
+  Print("Done.\n");

 }
 
 boolean DoGadgetAction(int image_id)
 }
 
 boolean DoGadgetAction(int image_id)