joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-13 17:48:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Wengier
2021-11-15 23:28:12 -05:00
parent 9893de5f7e
commit ae4a06c060
5 changed files with 33366 additions and 13509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33086
contrib/mappings/CP950.TXT
View File

File diff suppressed because it is too large Load Diff

13777
contrib/mappings/CP950.TXT.orig Normal file
View File

File diff suppressed because it is too large Load Diff

2
contrib/translations/en/en_US.lng
View File

@@ -2127,7 +2127,7 @@ COUNTRY [nnn]
nnn Specifies a country code.
Date and time formats will be affacted by the specified country code.
Date and time formats will be affected by the specified country code.
.
:SHELL_CMD_CTTY_HELP

6
src/hardware/vga_draw.cpp
View File

@@ -3331,7 +3331,7 @@ bool CheckBoxDrawing(uint8_t c1, uint8_t c2, uint8_t c3, uint8_t c4) {
(c1 == 220 && c2 == 220 && c3 == 220 && c4 == 219) || (c1 == 220 && c2 == 220 && c3 == 220 && c4 == 220) || (c1 == 222 && c2 == 222 && c3 == 222 && c4 == 222) ||
(c1 == 223 && c2 == 223 && c3 == 223 && c4 == 223) || (c1 == 223 && c2 == 220 && c3 == 220 && c4 == 220) || (c1 == 240 && c2 == 240 && c3 == 240 && c4 == 240) ||
(c1 == 207 && c2 == 207 && c3 == 207 && c4 == 207) || (c1 == 208 && c2 == 208 && c3 == 208 && c4 == 208) || (c1 == 254 && c2 == 177 && c3 == 177 && c4 == 177) ||
(c1 == 177 && c2 == 254 && c3 == 177 && c4 == 177) || (c1 == 177 & c2 == 177 && c3 == 254 && c4 == 177) || (c1 == 177 & c2 == 177 && c3 == 177 && c4 == 254) ||
(c1 == 177 && c2 == 254 && c3 == 177 && c4 == 177) || (c1 == 177 && c2 == 177 && c3 == 254 && c4 == 177) || (c1 == 177 && c2 == 177 && c3 == 177 && c4 == 254) ||
((c1 == 196 || c1 == 205) && c2 == 91 && (c3 == 15 || c3 == 49 || c3 == 254) && c4 == 93) || (c1 == 91 && (c2 == 15 || c2 == 49 || c2 == 254) && c3 == 93 && (c4 == 196 || c4 == 205));
}
@@ -3344,8 +3344,8 @@ bool CheckBoxDrawLast(Bitu col, uint8_t chr0, uint8_t chr1, uint8_t chr2, uint8_
}
bool connectLeft(uint8_t c, bool db, bool line) {
if (db) return !line && (c == 200 || c == 201 || c == 202 || c == 203) || c == 204 || c == 205 || c == 206;
else return !line && (c == 192 || c == 193 || c == 194 || c == 218) || c == 195 || c == 196 || c == 197;
if (db) return (!line && (c == 200 || c == 201 || c == 202 || c == 203)) || c == 204 || c == 205 || c == 206;
else return (!line && (c == 192 || c == 193 || c == 194 || c == 218)) || c == 195 || c == 196 || c == 197;
}
bool connectRight(uint8_t c, bool db, bool line) {

4
src/shell/shell.cpp
View File

@@ -1525,7 +1525,7 @@ void SHELL_Init() {
MSG_Add("SHELL_CMD_CHCP_MISSING", "ASCII characters not defined in TTF font: %d\n");
MSG_Add("SHELL_CMD_CHCP_INVALID", "Invalid code page number - %s\n");
MSG_Add("SHELL_CMD_COUNTRY_HELP", "Displays or changes the current country.\n");
MSG_Add("SHELL_CMD_COUNTRY_HELP_LONG", "COUNTRY [nnn] \n\n nnn Specifies a country code.\n\nDate and time formats will be affacted by the specified country code.\n");
MSG_Add("SHELL_CMD_COUNTRY_HELP_LONG", "COUNTRY [nnn] \n\n nnn Specifies a country code.\n\nDate and time formats will be affected by the specified country code.\n");
MSG_Add("SHELL_CMD_CTTY_HELP","Changes the terminal device used to control the system.\n");
MSG_Add("SHELL_CMD_CTTY_HELP_LONG","CTTY device\n device The terminal device to use, such as CON.\n");
MSG_Add("SHELL_CMD_MORE_HELP","Displays output one screen at a time.\n");
@@ -1542,7 +1542,7 @@ void SHELL_Init() {
/* Regular startup */
call_shellstop=CALLBACK_Allocate();
/* Setup the startup CS:IP to kill the last running machine when exitted */
/* Setup the startup CS:IP to kill the last running machine when exited */
RealPt newcsip=CALLBACK_RealPointer(call_shellstop);
SegSet16(cs,RealSeg(newcsip));
reg_ip=RealOff(newcsip);