From 228ccf8a7bb97d86355ea667b7e7fb596e8aa85a Mon Sep 17 00:00:00 2001
From: Michael Long <mlong@mlong.us>
Date: Tue, 1 Dec 2020 22:45:07 -0800
Subject: [PATCH] more worldz default install for solomoriah's war

---
 xtrn/war/install-xtrn.ini | 34 +++++++++++++++++++++++++++++++---
 xtrn/war/warcommon.js     |  2 ++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/xtrn/war/install-xtrn.ini b/xtrn/war/install-xtrn.ini
index eda488a146..9f9cca9766 100644
--- a/xtrn/war/install-xtrn.ini
+++ b/xtrn/war/install-xtrn.ini
@@ -1,4 +1,4 @@
-; 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
diff --git a/xtrn/war/warcommon.js b/xtrn/war/warcommon.js
index 6101be885a..271f6cfe2e 100644
--- a/xtrn/war/warcommon.js
+++ b/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');
-- 
GitLab