diff options
Diffstat (limited to 'src/sledjchisl/sledjchisl.c')
-rw-r--r-- | src/sledjchisl/sledjchisl.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c index d2be221..c068d57 100644 --- a/src/sledjchisl/sledjchisl.c +++ b/src/sledjchisl/sledjchisl.c | |||
@@ -1160,7 +1160,7 @@ static int filterInis(struct dirtree *node) | |||
1160 | 1160 | ||
1161 | // Get the details from all the .ini or .shini sim files. | 1161 | // Get the details from all the .ini or .shini sim files. |
1162 | // Creates the .shini and sims.lua files if it's an old install. | 1162 | // Creates the .shini and sims.lua files if it's an old install. |
1163 | // TODO - read the .shini and sims.lua if they exist. | 1163 | // TODO - read the .shini and if it exists. |
1164 | /* | 1164 | /* |
1165 | ourSims shall be - | 1165 | ourSims shall be - |
1166 | int len, num; | 1166 | int len, num; |
@@ -1250,16 +1250,6 @@ simList *getSims() | |||
1250 | newPath = xmprintf("%s/%s.shini", scEtc, name); | 1250 | newPath = xmprintf("%s/%s.shini", scEtc, name); |
1251 | d("Reading .ini file %s", path); | 1251 | d("Reading .ini file %s", path); |
1252 | ini = qconfig_parse_file(NULL, path, '='); | 1252 | ini = qconfig_parse_file(NULL, path, '='); |
1253 | |||
1254 | /* | ||
1255 | [Region] | ||
1256 | Location = "1,1" | ||
1257 | InternalPort = "9008" | ||
1258 | MaxPrims = 45000 | ||
1259 | |||
1260 | [Network] | ||
1261 | http_listener_port = 9007 | ||
1262 | */ | ||
1263 | simd->name = qstrunchar(ini->getstr(ini, "Region.RegionName", true), '"', '"'); | 1253 | simd->name = qstrunchar(ini->getstr(ini, "Region.RegionName", true), '"', '"'); |
1264 | simd->UUID = qstrunchar(ini->getstr(ini, "Region.RegionUUID", true), '"', '"'); | 1254 | simd->UUID = qstrunchar(ini->getstr(ini, "Region.RegionUUID", true), '"', '"'); |
1265 | simd->regionType = qstrunchar(ini->getstr(ini, "Region.RegionType", true), '"', '"'); | 1255 | simd->regionType = qstrunchar(ini->getstr(ini, "Region.RegionType", true), '"', '"'); |
@@ -8084,7 +8074,7 @@ fcgiDone: | |||
8084 | switch (currentMode) | 8074 | switch (currentMode) |
8085 | { | 8075 | { |
8086 | case START : // "start sim01" "start 'Welcome sim'" "start Welcome.ini" "start Welcome" "start" start everything | 8076 | case START : // "start sim01" "start 'Welcome sim'" "start Welcome.ini" "start Welcome" "start" start everything |
8087 | { // TODO - check if sim is down, but tmux window is still up, and close the tmux window first. | 8077 | { |
8088 | if (!checkSimIsRunning(simd->tab)) | 8078 | if (!checkSimIsRunning(simd->tab)) |
8089 | { | 8079 | { |
8090 | I("Tmux tab [%d:%s](pane %d) tmux ID %s, from %s/sim%d - %s is starting.", window, type, pane, simd->paneID, scTemp, count, simd->name); | 8080 | I("Tmux tab [%d:%s](pane %d) tmux ID %s, from %s/sim%d - %s is starting.", window, type, pane, simd->paneID, scTemp, count, simd->name); |