Index: trunk/Ohana/src/kii/setup/SetUpWindow.c
===================================================================
--- trunk/Ohana/src/kii/setup/SetUpWindow.c	(revision 2466)
+++ trunk/Ohana/src/kii/setup/SetUpWindow.c	(revision 5700)
@@ -23,9 +23,5 @@
   NameWindow (graphic, "Ki'i");
 
-  if ((N = get_argument (*argc, argv, "-nomap"))) {
-    remove_argument(N, argc, argv);
-  } else {
-    MapWindow (graphic);
-  }  
+  if (MAP_WINDOW) MapWindow (graphic);
 }