Skip to content
Snippets Groups Projects
Commit 176919c9 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Add/use "NoDOS" text.dat string

Displayed instead of hard-coded string in xtrn.cpp when attempting to run
16-bit DOS program on system with no DOS/DOSemu support.
parent 32690ef6
No related branches found
No related tags found
No related merge requests found
...@@ -1116,3 +1116,4 @@ ...@@ -1116,3 +1116,4 @@
"@Deleted@ %d %s" 929 DeletedNumberItems "@Deleted@ %d %s" 929 DeletedNumberItems
"E-Mail" 930 E_Mail "E-Mail" 930 E_Mail
"E-Mails" 931 E_Mails "E-Mails" 931 E_Mails
"Sorry, DOS programs are not supported on this node.\r\n" 932 NoDOS
\ No newline at end of file
...@@ -938,7 +938,8 @@ var Deleted=928; ...@@ -938,7 +938,8 @@ var Deleted=928;
var DeletedNumberItems=929; var DeletedNumberItems=929;
var E_Mail=930; var E_Mail=930;
var E_Mails=931; var E_Mails=931;
var NoDOS=932;
var TOTAL_TEXT=932; var TOTAL_TEXT=933;
this; this;
...@@ -948,6 +948,7 @@ enum text { ...@@ -948,6 +948,7 @@ enum text {
,DeletedNumberItems ,DeletedNumberItems
,E_Mail ,E_Mail
,E_Mails ,E_Mails
,NoDOS
,TOTAL_TEXT ,TOTAL_TEXT
}; };
......
...@@ -1494,4 +1494,6 @@ const char * const text_defaults[TOTAL_TEXT] = { ...@@ -1494,4 +1494,6 @@ const char * const text_defaults[TOTAL_TEXT] = {
,"\x40\x44\x65\x6c\x65\x74\x65\x64\x40\x20\x25\x64\x20\x25\x73" // 929 DeletedNumberItems ,"\x40\x44\x65\x6c\x65\x74\x65\x64\x40\x20\x25\x64\x20\x25\x73" // 929 DeletedNumberItems
,"\x45\x2d\x4d\x61\x69\x6c" // 930 E_Mail ,"\x45\x2d\x4d\x61\x69\x6c" // 930 E_Mail
,"\x45\x2d\x4d\x61\x69\x6c\x73" // 931 E_Mails ,"\x45\x2d\x4d\x61\x69\x6c\x73" // 931 E_Mails
,"\x53\x6f\x72\x72\x79\x2c\x20\x44\x4f\x53\x20\x70\x72\x6f\x67\x72\x61\x6d\x73\x20\x61\x72\x65\x20\x6e\x6f\x74\x20\x73\x75\x70\x70"
"\x6f\x72\x74\x65\x64\x20\x6f\x6e\x20\x74\x68\x69\x73\x20\x6e\x6f\x64\x65\x2e\x0d\x0a" // 932 NoDOS
}; };
...@@ -932,4 +932,5 @@ const char* const text_id[] = { ...@@ -932,4 +932,5 @@ const char* const text_id[] = {
,"DeletedNumberItems" ,"DeletedNumberItems"
,"E_Mail" ,"E_Mail"
,"E_Mails" ,"E_Mails"
,"NoDOS"
}; };
...@@ -396,7 +396,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) ...@@ -396,7 +396,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir)
if (!native && (startup->options & BBS_OPT_NO_DOS)) { if (!native && (startup->options & BBS_OPT_NO_DOS)) {
lprintf((mode & EX_OFFLINE) ? LOG_ERR : LOG_WARNING, "DOS programs not supported: %s", cmdline); lprintf((mode & EX_OFFLINE) ? LOG_ERR : LOG_WARNING, "DOS programs not supported: %s", cmdline);
bprintf("Sorry, DOS programs are not supported on this node.\r\n"); bputs(text[NoDOS]);
return -1; return -1;
} }
if (mode & EX_OFFLINE) if (mode & EX_OFFLINE)
...@@ -1200,7 +1200,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) ...@@ -1200,7 +1200,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir)
} else { } else {
if (startup->options & BBS_OPT_NO_DOS) { if (startup->options & BBS_OPT_NO_DOS) {
lprintf((mode & EX_OFFLINE) ? LOG_ERR : LOG_WARNING, "DOS programs not supported: %s", cmdline); lprintf((mode & EX_OFFLINE) ? LOG_ERR : LOG_WARNING, "DOS programs not supported: %s", cmdline);
bprintf("Sorry, DOS programs are not supported on this node.\r\n"); bputs(text[NoDOS]);
return -1; return -1;
} }
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
...@@ -1333,7 +1333,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) ...@@ -1333,7 +1333,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir)
/* must have sbbs.ini bbs useDOSemu=1 (or empty), cannot be =0 */ /* must have sbbs.ini bbs useDOSemu=1 (or empty), cannot be =0 */
if (!startup->usedosemu) { if (!startup->usedosemu) {
lprintf((mode & EX_OFFLINE) ? LOG_ERR : LOG_WARNING, "DOSEMU disabled, program not run"); lprintf((mode & EX_OFFLINE) ? LOG_ERR : LOG_WARNING, "DOSEMU disabled, program not run");
bprintf("Sorry, DOSEMU is not supported on this node.\r\n"); bputs(text[NoDOS]);
return -1; return -1;
} }
...@@ -1341,13 +1341,13 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) ...@@ -1341,13 +1341,13 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir)
SAFECOPY(dosemubinloc, (cmdstr(startup->dosemu_path, nulstr, nulstr, tok))); SAFECOPY(dosemubinloc, (cmdstr(startup->dosemu_path, nulstr, nulstr, tok)));
if (dosemubinloc[0] == '\0') { if (dosemubinloc[0] == '\0') {
lprintf((mode & EX_OFFLINE) ? LOG_ERR : LOG_WARNING, "DOSEMU invalid DOSEmuPath, program not run"); lprintf((mode & EX_OFFLINE) ? LOG_ERR : LOG_WARNING, "DOSEMU invalid DOSEmuPath, program not run");
bprintf("Sorry, DOSEMU is not supported on this node.\r\n"); bputs(text[NoDOS]);
return -1; return -1;
} }
if (!fexist(dosemubinloc)) { if (!fexist(dosemubinloc)) {
lprintf((mode & EX_OFFLINE) ? LOG_ERR : LOG_WARNING, "DOSEMU not found: %s", dosemubinloc); lprintf((mode & EX_OFFLINE) ? LOG_ERR : LOG_WARNING, "DOSEMU not found: %s", dosemubinloc);
bprintf("Sorry, DOSEMU is not supported on this node.\r\n"); bputs(text[NoDOS]);
return -1; return -1;
} }
...@@ -1594,7 +1594,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) ...@@ -1594,7 +1594,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir)
#else #else
lprintf((mode & EX_OFFLINE) ? LOG_ERR : LOG_WARNING, "DOS programs not supported: %s", cmdline); lprintf((mode & EX_OFFLINE) ? LOG_ERR : LOG_WARNING, "DOS programs not supported: %s", cmdline);
bprintf("Sorry, DOS programs are not supported on this node.\r\n"); bputs(text[NoDOS]);
return -1; return -1;
#endif #endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment