SZS v2.41a

1 files changed, 73 insertions, 61 deletions

diff --git a/project/src/ui/ui-wlect.c b/project/src/ui/ui-wlect.c
index b7093fb..29f4faf 100644
--- a/project/src/ui/ui-wlect.c
+++ b/project/src/ui/ui-wlect.c
@@ -465,15 +465,17 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] =
 
     {	OPT_QUIET, false, false, false, false, false, 'q', "quiet",
 	0,
-	"Be quiet and print only error messages. Multiple usage is possible."
-	" The impact is command dependent. In general: If set three times,"
-	" different file format warnings are suppressed."
+	"Be quiet and print only error messages. Multiple use is possible."
+	" Previous use of --verbose is reverted. The impact is command"
+	" dependent. If set at least three times, almost all error messages"
+	" will be suppressed."
     },
 
     {	OPT_VERBOSE, false, false, false, false, false, 'v', "verbose",
 	0,
-	"Be verbose and print more progress information. Multiple usage is"
-	" possible. The impact is command dependent."
+	"Be verbose and print more progress information. Multiple use is"
+	" possible. Previous use of --quiet is reverted. The impact is command"
+	" dependent."
     },
 
     {	OPT_LOGGING, false, false, false, false, false, 'L', "logging",
@@ -540,6 +542,12 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] =
 	" compatibility with the other tools."
     },
 
+    {	OPT_LE_04X, false, false, false, false, false, 0, "le-04x",
+	0,
+	"Use format %04x instead of %03x for LE-CODE slots to enable uniform"
+	" slot numbers if slots >4095 are used."
+    },
+
     {	OPT_LOAD_PREFIX, false, false, false, false, false, 0, "load-prefix",
 	"file",
 	"Read in a PREFIX file and replace the internal prefix database with"
@@ -699,7 +707,7 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] =
 	" helper option."
     },
 
-    {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 91
+    {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 92
 
 };
 
@@ -905,6 +913,8 @@ static const struct option OptionLong[] =
 	 { "ctcode",		0, 0, GO_CT_CODE },
 	{ "le-code",		2, 0, GO_LE_CODE },
 	 { "lecode",		2, 0, GO_LE_CODE },
+	{ "le-04x",		0, 0, GO_LE_04X },
+	 { "le04x",		0, 0, GO_LE_04X },
 	{ "load-prefix",	1, 0, GO_LOAD_PREFIX },
 	 { "loadprefix",	1, 0, GO_LOAD_PREFIX },
 	{ "load-category",	1, 0, GO_LOAD_CATEGORY },
@@ -1092,60 +1102,61 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] =
 	/* 0x08a   */	OPT_NO_COLORS,
 	/* 0x08b   */	OPT_CT_CODE,
 	/* 0x08c   */	OPT_LE_CODE,
-	/* 0x08d   */	OPT_LOAD_PREFIX,
-	/* 0x08e   */	OPT_LOAD_CATEGORY,
-	/* 0x08f   */	OPT_PLUS,
-	/* 0x090   */	OPT_CHDIR,
-	/* 0x091   */	OPT_ROUND,
-	/* 0x092   */	OPT_NO_WILDCARDS,
-	/* 0x093   */	OPT_IN_ORDER,
-	/* 0x094   */	OPT_NO_ECHO,
-	/* 0x095   */	OPT_UTF_8,
-	/* 0x096   */	OPT_NO_UTF_8,
-	/* 0x097   */	OPT_CACHE,
-	/* 0x098   */	OPT_LOG_CACHE,
-	/* 0x099   */	OPT_LT_CLEAR,
-	/* 0x09a   */	OPT_LT_ONLINE,
-	/* 0x09b   */	OPT_LT_N_PLAYERS,
-	/* 0x09c   */	OPT_LT_COND_BIT,
-	/* 0x09d   */	OPT_LT_GAME_MODE,
-	/* 0x09e   */	OPT_LT_ENGINE,
-	/* 0x09f   */	OPT_LT_RANDOM,
-	/* 0x0a0   */	OPT_LEX_PURGE,
-	/* 0x0a1   */	OPT_LEX_RM_FEAT,
-	/* 0x0a2   */	OPT_FORCE,
-	/* 0x0a3   */	OPT_REPAIR_MAGICS,
-	/* 0x0a4   */	OPT_CREATE_DISTRIB,
-	/* 0x0a5   */	OPT_OLD,
-	/* 0x0a6   */	OPT_STD,
-	/* 0x0a7   */	OPT_NEW,
-	/* 0x0a8   */	OPT_EXTRACT,
-	/* 0x0a9   */	OPT_LE_DEFINE,
-	/* 0x0aa   */	OPT_LE_ARENA,
-	/* 0x0ab   */	OPT_LPAR,
-	/* 0x0ac   */	OPT_ALIAS,
-	/* 0x0ad   */	OPT_ENGINE,
-	/* 0x0ae   */	OPT_200CC,
-	/* 0x0af   */	OPT_PERFMON,
-	/* 0x0b0   */	OPT_CUSTOM_TT,
-	/* 0x0b1   */	OPT_XPFLAGS,
-	/* 0x0b2   */	OPT_SPEEDOMETER,
-	/* 0x0b3   */	OPT_DEBUG,
-	/* 0x0b4   */	OPT_TRACK_DIR,
-	/* 0x0b5   */	OPT_COPY_TRACKS,
-	/* 0x0b6   */	OPT_MOVE_TRACKS,
-	/* 0x0b7   */	OPT_MOVE1_TRACKS,
-	/* 0x0b8   */	OPT_LINK_TRACKS,
-	/* 0x0b9   */	OPT_SZS_MODE,
-	/* 0x0ba   */	OPT_LOAD_BMG,
-	/* 0x0bb   */	OPT_PATCH_BMG,
-	/* 0x0bc   */	OPT_MACRO_BMG,
-	/* 0x0bd   */	OPT_PATCH_NAMES,
-	/* 0x0be   */	OPT_ORDER_BY,
-	/* 0x0bf   */	OPT_ORDER_ALL,
-	/* 0x0c0   */	OPT_NUMBER,
-	/* 0x0c1   */	OPT_SECTIONS,
-	/* 0x0c2   */	 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,
+	/* 0x08d   */	OPT_LE_04X,
+	/* 0x08e   */	OPT_LOAD_PREFIX,
+	/* 0x08f   */	OPT_LOAD_CATEGORY,
+	/* 0x090   */	OPT_PLUS,
+	/* 0x091   */	OPT_CHDIR,
+	/* 0x092   */	OPT_ROUND,
+	/* 0x093   */	OPT_NO_WILDCARDS,
+	/* 0x094   */	OPT_IN_ORDER,
+	/* 0x095   */	OPT_NO_ECHO,
+	/* 0x096   */	OPT_UTF_8,
+	/* 0x097   */	OPT_NO_UTF_8,
+	/* 0x098   */	OPT_CACHE,
+	/* 0x099   */	OPT_LOG_CACHE,
+	/* 0x09a   */	OPT_LT_CLEAR,
+	/* 0x09b   */	OPT_LT_ONLINE,
+	/* 0x09c   */	OPT_LT_N_PLAYERS,
+	/* 0x09d   */	OPT_LT_COND_BIT,
+	/* 0x09e   */	OPT_LT_GAME_MODE,
+	/* 0x09f   */	OPT_LT_ENGINE,
+	/* 0x0a0   */	OPT_LT_RANDOM,
+	/* 0x0a1   */	OPT_LEX_PURGE,
+	/* 0x0a2   */	OPT_LEX_RM_FEAT,
+	/* 0x0a3   */	OPT_FORCE,
+	/* 0x0a4   */	OPT_REPAIR_MAGICS,
+	/* 0x0a5   */	OPT_CREATE_DISTRIB,
+	/* 0x0a6   */	OPT_OLD,
+	/* 0x0a7   */	OPT_STD,
+	/* 0x0a8   */	OPT_NEW,
+	/* 0x0a9   */	OPT_EXTRACT,
+	/* 0x0aa   */	OPT_LE_DEFINE,
+	/* 0x0ab   */	OPT_LE_ARENA,
+	/* 0x0ac   */	OPT_LPAR,
+	/* 0x0ad   */	OPT_ALIAS,
+	/* 0x0ae   */	OPT_ENGINE,
+	/* 0x0af   */	OPT_200CC,
+	/* 0x0b0   */	OPT_PERFMON,
+	/* 0x0b1   */	OPT_CUSTOM_TT,
+	/* 0x0b2   */	OPT_XPFLAGS,
+	/* 0x0b3   */	OPT_SPEEDOMETER,
+	/* 0x0b4   */	OPT_DEBUG,
+	/* 0x0b5   */	OPT_TRACK_DIR,
+	/* 0x0b6   */	OPT_COPY_TRACKS,
+	/* 0x0b7   */	OPT_MOVE_TRACKS,
+	/* 0x0b8   */	OPT_MOVE1_TRACKS,
+	/* 0x0b9   */	OPT_LINK_TRACKS,
+	/* 0x0ba   */	OPT_SZS_MODE,
+	/* 0x0bb   */	OPT_LOAD_BMG,
+	/* 0x0bc   */	OPT_PATCH_BMG,
+	/* 0x0bd   */	OPT_MACRO_BMG,
+	/* 0x0be   */	OPT_PATCH_NAMES,
+	/* 0x0bf   */	OPT_ORDER_BY,
+	/* 0x0c0   */	OPT_ORDER_ALL,
+	/* 0x0c1   */	OPT_NUMBER,
+	/* 0x0c2   */	OPT_SECTIONS,
+	/* 0x0c3   */	 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,
 	/* 0x0d0   */	 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
 	/* 0x0e0   */	 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
 	/* 0x0f0   */	 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -1369,6 +1380,7 @@ static const InfoOption_t * option_tab_tool[] =
 	OptionInfo + OPT_NO_COLORS,
 	OptionInfo + OPT_CT_CODE,
 	OptionInfo + OPT_LE_CODE,
+	OptionInfo + OPT_LE_04X,
 	OptionInfo + OPT_LOAD_PREFIX,
 	OptionInfo + OPT_LOAD_CATEGORY,
 	OptionInfo + OPT_CHDIR,
@@ -1950,7 +1962,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
 	"wlect [option]... command [option|parameter|file]...",
 	"Wiimms LE-CODE Tool : Manage the LE-CODE and LEX extensions.",
 	0,
-	36,
+	37,
 	option_tab_tool,
 	0
     },