Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dosbox-staging/dosbox-staging.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert de Rooy <robert.de.rooy@gmail.com>2022-10-11 21:31:02 +0300
committerkcgen <1557255+kcgen@users.noreply.github.com>2022-10-13 09:31:05 +0300
commit059e49cf418869fbedcae482ba483865d4ba402a (patch)
tree0e0be734e1149810a592303837e8b8d053b2d3fd
parent7ee5e3cf3b811e1b6313ccf2e49fe4dc2960a33d (diff)
Fix mistakes in switching to ansi text codes
-rw-r--r--src/dosbox.cpp10
-rw-r--r--src/shell/shell.cpp6
2 files changed, 8 insertions, 8 deletions
diff --git a/src/dosbox.cpp b/src/dosbox.cpp
index f16607583..addca086d 100644
--- a/src/dosbox.cpp
+++ b/src/dosbox.cpp
@@ -1019,11 +1019,11 @@ void DOSBOX_Init()
Pstring->Set_help(
"Type of joystick to emulate: auto (default),\n"
"auto : Detect and use any joystick(s), if possible.,\n"
- "2axis : Support up to two joysticks.\n"
- "4axis : Support the first joystick only.\n"
- "4axis_2 : Support the second joystick only.\n"
- "fcs : Support a Thrustmaster-type joystick.\n"
- "ch : Support a CH Flightstick-type joystick.\n"
+ "2axis : Support up to two joysticks, each with 2 axis\n"
+ "4axis : Support the first joystick only, as a 4-axis type.\n"
+ "4axis_2 : Support the second joystick only, as a 4-axis type.\n"
+ "fcs : Emulate joystick as an original Thrustmaster FCS.\n"
+ "ch : Emulate joystick as an original CH Flightstick.\n"
"hidden : Prevent DOS from seeing the joystick(s), but enable them for\n"
" mapping.\n"
"disabled : Fully disable joysticks: won't be polled, mapped, or visible in DOS.\n"
diff --git a/src/shell/shell.cpp b/src/shell/shell.cpp
index a63a847b3..05563040b 100644
--- a/src/shell/shell.cpp
+++ b/src/shell/shell.cpp
@@ -1031,7 +1031,7 @@ void SHELL_Init() {
MSG_Add("SHELL_CMD_DIR_INTRO"," Directory of %s\n");
MSG_Add("SHELL_CMD_DIR_BYTES_USED","%17d file(s) %21s bytes\n");
MSG_Add("SHELL_CMD_DIR_BYTES_FREE","%17d dir(s) %21s bytes free\n");
- MSG_Add("SHELL_EXECUTE_DRIVE_NOT_FOUND","Drive %c does not exist!\nYou must [color=light-red]mount[reset] it first. Type [color=yellow]intro[reset]or [color=yellow]intro mount[reset] for more information.\n");
+ MSG_Add("SHELL_EXECUTE_DRIVE_NOT_FOUND","Drive %c does not exist!\nYou must [color=light-red]mount[reset] it first. Type [color=yellow]intro[reset] or [color=yellow]intro mount[reset] for more information.\n");
MSG_Add("SHELL_EXECUTE_ILLEGAL_COMMAND","Illegal command: %s.\n");
MSG_Add("SHELL_CMD_PAUSE", "Press a key to continue...");
MSG_Add("SHELL_CMD_PAUSE_HELP", "Waits for a keystroke to continue.\n");
@@ -1472,10 +1472,10 @@ void SHELL_Init() {
"Displays or changes file attributes.\n");
MSG_Add("SHELL_CMD_ATTRIB_HELP_LONG",
"Usage:\n"
- " [color=green]attrib[reset] [color=cyan][ATTRIBUTES][reset] [color=cyan]PATTERN[reset] [/S]\n"
+ " [color=green]attrib[reset] [color=white][ATTRIBUTES][reset] [color=cyan]PATTERN[reset] [/S]\n"
"\n"
"Where:\n"
- " [color=cyan]ATTRIBUTES[reset] are attributes to apply, including one or more of the following:\n"
+ " [color=white]ATTRIBUTES[reset] are attributes to apply, including one or more of the following:\n"
" [color=white]+R[reset], [color=white]-R[reset], [color=white]+A[reset], [color=white]-A[reset], [color=white]+S[reset], [color=white]-S[reset], [color=white]+H[reset], [color=white]-H[reset]\n"
" Where: R = Read-only, A = Archive, S = System, H = Hidden\n"
" [color=cyan]PATTERN[reset] can be either an exact filename or an inexact filename with\n"