Merge remote-tracking branch 'origin/master'

exec/load/install-3rdp-xtrn.js

@@ -18,9 +18,9 @@ function scan(options)
 	if(options === undefined)
 		options = {};
 	if(!options.src_dir)
-		options.src_dir = "../xtrn/3rdp-install/";
+		options.src_dir = fullpath(system.ctrl_dir + "../xtrn/3rdp-install/");
 	if(!options.xtrn_dir)
-		options.xtrn_dir = "../xtrn/";
+		options.xtrn_dir = fullpath(system.ctrl_dir + "../xtrn/");
 	
 	var out = [];
 	var exe_list = {};

src/sbbs3/scfg/scfg.c

@@ -288,6 +288,7 @@ int main(int argc, char **argv)
 						"-c  =  force color mode\n"
 						"-m  =  force monochrome mode\n"
                         "-e# =  set escape delay to #msec\n"
+						"-insert = enable keyboard insert mode by default\n"
 						"-import=<filename> = import a message area list file\n"
 						"-faddr=<addr> = specify your FTN address for imported subs\n"
 						"-misc=<value> = specify option flags for imported subs\n"

xtrn/DDMsgReader/DDMsgReader.js

@@ -73,6 +73,9 @@
  *                              Bug fix: When forwarding a message, it now correctly
  *                              sets the to_net_type property in the message header to
  *                              FidoNet or internet for those types of message destinations
+ * 2020-12-01 Eric Oulashin     Version 1.39
+ *                              When forwarding a message, added the ability to
+ *                              optionally edit the message before forwarding it.
  */
@@ -184,8 +187,8 @@ if (system.version_num < 31500)
 }
 // Reader version information
-var READER_VERSION = "1.38";
-var READER_DATE = "2020-11-26";
+var READER_VERSION = "1.39";
+var READER_DATE = "2020-12-01";
 // Keyboard key codes for displaying on the screen
 var UP_ARROW = ascii(24);
@@ -13333,6 +13336,7 @@ function DigDistMsgReader_ForwardMessage(pMsgHdr, pMsgBody)
 				else
 					return "Unable to open the sub-board to get the message body";
 			}
+
 			// Prepend some lines to the message body to describe where
 			// the message came from originally.
 			var newMsgBody = "This is a forwarded message from " + system.name + "\n";
@@ -13354,6 +13358,56 @@ function DigDistMsgReader_ForwardMessage(pMsgHdr, pMsgBody)
 			newMsgBody += "==================================\n\n";
 			newMsgBody += pMsgBody;
+			// New - Editing the message
+			// TODO: Ask whether to edit the message before forwarding it,
+			// and use console.editfile(filename) to edit it.
+			if (!console.noyes("Edit the message before sending"))
+			{
+				var baseWorkDir = system.node_dir + "DDMsgReader_Temp";
+				deltree(baseWorkDir + "/");
+				if (mkdir(baseWorkDir))
+				{
+					// TODO: Let the user edit the message, then read it
+					// and set newMsgBody to it
+					var tmpMsgFilename = baseWorkDir + "/message.txt";
+					// Write the current message to the file
+					var wroteMsgToTmpFile = false;
+					var outFile = new File(tmpMsgFilename);
+					if (outFile.open("w"))
+					{
+						wroteMsgToTmpFile = outFile.write(newMsgBody, newMsgBody.length);
+						outFile.close();
+					}
+					if (wroteMsgToTmpFile)
+					{
+						// Let the user edit the file, and if successful,
+						// read it in to newMsgBody
+						if (console.editfile(tmpMsgFilename))
+						{
+							var inFile = new File(tmpMsgFilename);
+							if (inFile.open("r"))
+							{
+								newMsgBody = inFile.read(inFile.length);
+								inFile.close();
+							}
+						}
+					}
+					else
+					{
+						console.print("\1n\1cFailed to write message to a file for editing\1n");
+						console.crlf();
+						console.pause();
+					}
+				}
+				else
+				{
+					console.print("\1n\1cCouldn't create temporary directory\1n");
+					console.crlf();
+					console.pause();
+				}
+			}
+			// End New (editing message)
+
 			// Create part of a header object which will be used when saving/sending
 			// the message.  The destination ("to" informatoin) will be filled in
 			// according to the destination type.

xtrn/DDMsgReader/readme.txt

                       Digital Distortion Message Reader
-                                 Version 1.38
-                           Release date: 2020-11-26
+                                 Version 1.39
+                           Release date: 2020-12-01
 
                                      by
 

xtrn/DDMsgReader/revision_history.txt

@@ -5,6 +5,8 @@ Revision History (change log)
 =============================
 Version  Date         Description
 -------  ----         -----------
+1.39     2020-12-01   When forwarding a message, added the ability to optinally
+                      edit the message before forwarding it.
 1.38     2020-11-26   Bug fix: When forwarding a message, it now correctly sets
                       sets the to_net_type property in the message header to
                       FidoNet or internet for those types of message

xtrn/war/install-xtrn.ini

-; LORD installer data for install-xtrn.js
+; Solomoriah's War installer data for install-xtrn.js
 
 Name: Solomoriah's WAR!
 Desc: WAR Version 4.4 ported to JavaScript
@@ -14,15 +14,43 @@ execution_ars  = NOT GUEST
 settings = XTRN_MULTIUSER
 required = true
 
+[prog:WARALD]
+name = Solomoriah's WAR! on Alderon
+cmd  = ?war.js worlds/alderon
+execution_ars  = NOT GUEST
+settings = XTRN_MULTIUSER
+required = true
+
+[prog:WARSOL]
+name = Solomoriah's WAR! on Solomoriah
+cmd  = ?war.js worlds/solomoriah
+execution_ars  = NOT GUEST
+settings = XTRN_MULTIUSER
+required = true
+
+[prog:WARSP]
+name = Solomoriah's WAR! on Spacewar
+cmd  = ?war.js worlds/spacewar
+execution_ars  = NOT GUEST
+settings = XTRN_MULTIUSER
+required = true
+
+[prog:WARTAL]
+name = Solomoriah's WAR! on Toloivar
+cmd  = ?war.js worlds/tolivar
+execution_ars  = NOT GUEST
+settings = XTRN_MULTIUSER
+required = true
+
 [event:WARUPD]
 prompt = false
-cmd  = ?warupd.js worlds/earth
+cmd  = ?warupd.js earth alderon solomoriah spacewar tolivar
 name = WAR Update
 days = 127
 
 [event:WARPOLL]
 prompt = false
-cmd  = ?warpoll.js worlds/earth
+cmd  = ?warpoll.js earth alderon solomoriah spacewar tolivar
 name = WAR Poll
 days = 127
 freq = 60

xtrn/war/warcommon.js

@@ -555,6 +555,8 @@ function set_game(path)
 {
 	if(path.substr(0, 1)=='/' || (path.substr(1,1)==':' && path.substr(2,1)=='\\'))
 		game_dir = path;
+	else if(path.indexOf('/') === -1)
+        game_dir = fullpath(orig_exec_dir+'/worlds/'+path);
 	else
 		game_dir = fullpath(orig_exec_dir+'/'+path);
 	news = new File(game_dir+'/news');