dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jgrpp' into jgrpp-nrt

Browse Source 
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
#	src/ship_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2019-08-24 10:41:08 +01:00
parent 7ed86e7488 12be6fd81f
commit 04ef407ddf
48 changed files with 568 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/table/newgrf_debug_data.h
View File

@@ -616,6 +616,13 @@ class NIHTown : public NIHelper {
SetDParam(0, t->cargo_accepted_total);
b = GetString(b, STR_JUST_CARGO_LIST, lastof(buffer));
print(buffer);
seprintf(buffer, lastof(buffer), " Nearby stations: %u", (uint) t->stations_near.size());
print(buffer);
for (const Station *st : t->stations_near) {
seprintf(buffer, lastof(buffer), " %u: %s", st->index, st->GetCachedName());
print(buffer);
}
}
};

10
src/table/settings.ini
View File

@@ -53,6 +53,7 @@ static bool EnableSingleVehSharedOrderGuiChanged(int32 p1);
static bool UpdateClientName(int32 p1);
static bool UpdateServerPassword(int32 p1);
static bool UpdateRconPassword(int32 p1);
static bool UpdateSettingsPassword(int32 p1);
static bool UpdateClientConfigValues(int32 p1);
static bool CheckSharingRail(int32 p1);
static bool CheckSharingRoad(int32 p1);
@@ -5093,6 +5094,15 @@ guiflags = SGF_NETWORK_ONLY
def = nullptr
cat = SC_BASIC
[SDTC_STR]
var = network.settings_password
type = SLE_STRB
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = SGF_NETWORK_ONLY
def = nullptr
proc = UpdateSettingsPassword
cat = SC_EXPERT
[SDTC_STR]
var = network.default_company_pass
type = SLE_STRB