From 372d3c84711be3617801bd80b731bd9d8ffd7811 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Sun, 17 May 2009 04:32:11 +0000
Subject: [PATCH] Simplify wmlmove usage a bit.

---
 data/tools/wmlmove | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/data/tools/wmlmove b/data/tools/wmlmove
index 4ce0be2fb7c..6ebd1bd1507 100755
--- a/data/tools/wmlmove
+++ b/data/tools/wmlmove
@@ -211,8 +211,12 @@ overwrite()
                 print vcdelete(filename)
     else:
         if iclass == None:
-            print "# Defaulting image subclass to 'monsters', use -i to set it."
-            iclass = 'monsters'
+            if not iclass:
+                if uclass:
+                    iclass = uclass
+                else:
+                    iclass = 'monsters'
+                print "# Defaulting image subclass to '%s', use -i to set it." % iclass
         print "# Image moves:"
         for (name, defloc) in srcrefs.fileref.items():
             source = directory_namespace(name)