SZS v2.41a

1 files changed, 78 insertions, 66 deletions

diff --git a/project/src/ui/ui-wkmpt.c b/project/src/ui/ui-wkmpt.c
index f05cdfc..1732e0f 100644
--- a/project/src/ui/ui-wkmpt.c
+++ b/project/src/ui/ui-wkmpt.c
@@ -563,15 +563,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",
@@ -639,6 +641,12 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] =
 	" details."
     },
 
+    {	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_CHDIR, false, false, false, false, false, 0, "chdir",
 	"dir",
 	"Set a new working directory for all following options, for all"
@@ -913,7 +921,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 == 100
+    {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 101
 
 };
 
@@ -1230,6 +1238,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 },
 	{ "chdir",		1, 0, GO_CHDIR },
 	{ "const",		1, 0, 'c' },
 	{ "scale",		1, 0, GO_SCALE },
@@ -1423,65 +1433,66 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] =
 	/* 0x08a   */	OPT_NO_COLORS,
 	/* 0x08b   */	OPT_CT_CODE,
 	/* 0x08c   */	OPT_LE_CODE,
-	/* 0x08d   */	OPT_CHDIR,
-	/* 0x08e   */	OPT_SCALE,
-	/* 0x08f   */	OPT_SHIFT,
-	/* 0x090   */	OPT_XSS,
-	/* 0x091   */	OPT_YSS,
-	/* 0x092   */	OPT_ZSS,
-	/* 0x093   */	OPT_ROT,
-	/* 0x094   */	OPT_XROT,
-	/* 0x095   */	OPT_YROT,
-	/* 0x096   */	OPT_ZROT,
-	/* 0x097   */	OPT_YPOS,
-	/* 0x098   */	OPT_TRANSLATE,
-	/* 0x099   */	OPT_NULL,
-	/* 0x09a   */	OPT_NEXT,
-	/* 0x09b   */	OPT_ASCALE,
-	/* 0x09c   */	OPT_AROT,
-	/* 0x09d   */	OPT_TFORM_SCRIPT,
-	/* 0x09e   */	OPT_RM_GOBJ,
-	/* 0x09f   */	OPT_BATTLE,
-	/* 0x0a0   */	OPT_EXPORT_FLAGS,
-	/* 0x0a1   */	OPT_ROUTE_OPTIONS,
-	/* 0x0a2   */	OPT_WIM0,
-	/* 0x0a3   */	OPT_SLOT,
-	/* 0x0a4   */	OPT_POS_MODE,
-	/* 0x0a5   */	OPT_POS_FILE,
-	/* 0x0a6   */	OPT_PNG,
-	/* 0x0a7   */	OPT_LOAD_KCL,
-	/* 0x0a8   */	OPT_KCL,
-	/* 0x0a9   */	OPT_KCL_FLAG,
-	/* 0x0aa   */	OPT_KCL_SCRIPT,
-	/* 0x0ab   */	OPT_TRI_AREA,
-	/* 0x0ac   */	OPT_TRI_HEIGHT,
-	/* 0x0ad   */	OPT_FLAG_FILE,
-	/* 0x0ae   */	OPT_XTRIDATA,
-	/* 0x0af   */	OPT_KMP,
-	/* 0x0b0   */	OPT_N_LAPS,
-	/* 0x0b1   */	OPT_SPEED_MOD,
-	/* 0x0b2   */	OPT_KTPT2,
-	/* 0x0b3   */	OPT_TFORM_KMP,
-	/* 0x0b4   */	OPT_REPAIR_XPF,
-	/* 0x0b5   */	OPT_GAMEMODES,
-	/* 0x0b6   */	OPT_ROUND,
-	/* 0x0b7   */	OPT_NO_WILDCARDS,
-	/* 0x0b8   */	OPT_IN_ORDER,
-	/* 0x0b9   */	OPT_EPSILON,
-	/* 0x0ba   */	OPT_DIFF,
-	/* 0x0bb   */	OPT_NO_ECHO,
-	/* 0x0bc   */	OPT_UTF_8,
-	/* 0x0bd   */	OPT_NO_UTF_8,
-	/* 0x0be   */	OPT_FORCE,
-	/* 0x0bf   */	OPT_REPAIR_MAGICS,
-	/* 0x0c0   */	OPT_TINY,
-	/* 0x0c1   */	OPT_OLD,
-	/* 0x0c2   */	OPT_STD,
-	/* 0x0c3   */	OPT_NEW,
-	/* 0x0c4   */	OPT_EXTRACT,
-	/* 0x0c5   */	OPT_NUMBER,
-	/* 0x0c6   */	OPT_SECTIONS,
-	/* 0x0c7   */	 0,0,0,0, 0,0,0,0, 0,
+	/* 0x08d   */	OPT_LE_04X,
+	/* 0x08e   */	OPT_CHDIR,
+	/* 0x08f   */	OPT_SCALE,
+	/* 0x090   */	OPT_SHIFT,
+	/* 0x091   */	OPT_XSS,
+	/* 0x092   */	OPT_YSS,
+	/* 0x093   */	OPT_ZSS,
+	/* 0x094   */	OPT_ROT,
+	/* 0x095   */	OPT_XROT,
+	/* 0x096   */	OPT_YROT,
+	/* 0x097   */	OPT_ZROT,
+	/* 0x098   */	OPT_YPOS,
+	/* 0x099   */	OPT_TRANSLATE,
+	/* 0x09a   */	OPT_NULL,
+	/* 0x09b   */	OPT_NEXT,
+	/* 0x09c   */	OPT_ASCALE,
+	/* 0x09d   */	OPT_AROT,
+	/* 0x09e   */	OPT_TFORM_SCRIPT,
+	/* 0x09f   */	OPT_RM_GOBJ,
+	/* 0x0a0   */	OPT_BATTLE,
+	/* 0x0a1   */	OPT_EXPORT_FLAGS,
+	/* 0x0a2   */	OPT_ROUTE_OPTIONS,
+	/* 0x0a3   */	OPT_WIM0,
+	/* 0x0a4   */	OPT_SLOT,
+	/* 0x0a5   */	OPT_POS_MODE,
+	/* 0x0a6   */	OPT_POS_FILE,
+	/* 0x0a7   */	OPT_PNG,
+	/* 0x0a8   */	OPT_LOAD_KCL,
+	/* 0x0a9   */	OPT_KCL,
+	/* 0x0aa   */	OPT_KCL_FLAG,
+	/* 0x0ab   */	OPT_KCL_SCRIPT,
+	/* 0x0ac   */	OPT_TRI_AREA,
+	/* 0x0ad   */	OPT_TRI_HEIGHT,
+	/* 0x0ae   */	OPT_FLAG_FILE,
+	/* 0x0af   */	OPT_XTRIDATA,
+	/* 0x0b0   */	OPT_KMP,
+	/* 0x0b1   */	OPT_N_LAPS,
+	/* 0x0b2   */	OPT_SPEED_MOD,
+	/* 0x0b3   */	OPT_KTPT2,
+	/* 0x0b4   */	OPT_TFORM_KMP,
+	/* 0x0b5   */	OPT_REPAIR_XPF,
+	/* 0x0b6   */	OPT_GAMEMODES,
+	/* 0x0b7   */	OPT_ROUND,
+	/* 0x0b8   */	OPT_NO_WILDCARDS,
+	/* 0x0b9   */	OPT_IN_ORDER,
+	/* 0x0ba   */	OPT_EPSILON,
+	/* 0x0bb   */	OPT_DIFF,
+	/* 0x0bc   */	OPT_NO_ECHO,
+	/* 0x0bd   */	OPT_UTF_8,
+	/* 0x0be   */	OPT_NO_UTF_8,
+	/* 0x0bf   */	OPT_FORCE,
+	/* 0x0c0   */	OPT_REPAIR_MAGICS,
+	/* 0x0c1   */	OPT_TINY,
+	/* 0x0c2   */	OPT_OLD,
+	/* 0x0c3   */	OPT_STD,
+	/* 0x0c4   */	OPT_NEW,
+	/* 0x0c5   */	OPT_EXTRACT,
+	/* 0x0c6   */	OPT_NUMBER,
+	/* 0x0c7   */	OPT_SECTIONS,
+	/* 0x0c8   */	 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,
@@ -1711,6 +1722,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_CHDIR,
 	OptionInfo + OPT_CONST,
 	OptionInfo + OPT_BATTLE,
@@ -2322,7 +2334,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
 	"Wiimms KMP Tool : Analyze, modify, export and create (compile) KMP"
 	" files.",
 	0,
-	39,
+	40,
 	option_tab_tool,
 	0
     },