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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	.github/changelog.sh
#	cmake/PackageDeb.cmake
#	src/network/network_client.cpp
#	src/settings_gui.cpp
This commit is contained in:
Jonathan G Rennison
2021-01-29 18:27:36 +00:00
parent dddcd6d441 4c1ee264a6
commit cb69611248
15 changed files with 758 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/network_content.cpp
View File

@@ -910,7 +910,7 @@ void ClientNetworkContentSocketHandler::ToggleSelectedState(const ContentInfo *c
*/
void ClientNetworkContentSocketHandler::ReverseLookupDependency(ConstContentVector &parents, const ContentInfo *child) const
{
for (const ContentInfo * const &ci : this->infos) {
for (const ContentInfo *ci : this->infos) {
if (ci == child) continue;
for (uint i = 0; i < ci->dependency_count; i++) {