forked from mirror/OpenTTD
Remove: ENABLE_NETWORK switch
This switch has been a pain for years. Often disabling broke compilation, as no developer compiles OpenTTD without, neither do any of our official binaries. Additionaly, it has grown so hugely in our codebase, that it clearly shows that the current solution was a poor one. 350+ instances of "#ifdef ENABLE_NETWORK" were in the code, of which only ~30 in the networking code itself. The rest were all around the code to do the right thing, from GUI to NewGRF. A more proper solution would be to stub all the functions, and make sure the rest of the code can simply assume network is available. This was also partially done, and most variables were correct if networking was disabled. Despite that, often the #ifdefs were still used. With the recent removal of DOS, there is also no platform anymore which we support where networking isn't working out-of-the-box. All in all, it is time to remove the ENABLE_NETWORK switch. No replacement is planned, but if you feel we really need this option, we welcome any Pull Request which implements this in a way that doesn't crawl through the code like this diff shows we used to.
This commit is contained in:
@@ -1126,11 +1126,9 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
|
||||
if (!_network_available) {
|
||||
ShowErrorMessage(STR_NETWORK_ERROR_NOTAVAILABLE, INVALID_STRING_ID, WL_ERROR);
|
||||
} else {
|
||||
#if defined(ENABLE_NETWORK)
|
||||
this->DeleteChildWindows(WC_QUERY_STRING); // Remove the parameter query window
|
||||
|
||||
ShowMissingContentWindow(this->actives);
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -1543,7 +1541,6 @@ private:
|
||||
}
|
||||
};
|
||||
|
||||
#if defined(ENABLE_NETWORK)
|
||||
/**
|
||||
* Show the content list window with all missing grfs from the given list.
|
||||
* @param list The list of grfs to check for missing / not exactly matching ones.
|
||||
@@ -1565,7 +1562,6 @@ void ShowMissingContentWindow(const GRFConfig *list)
|
||||
}
|
||||
ShowNetworkContentListWindow(cv.Length() == 0 ? NULL : &cv, CONTENT_TYPE_NEWGRF);
|
||||
}
|
||||
#endif
|
||||
|
||||
Listing NewGRFWindow::last_sorting = {false, 0};
|
||||
Filtering NewGRFWindow::last_filtering = {false, 0};
|
||||
|
Reference in New Issue
Block a user