Merge branch 'master' into depature-boards

Conflicts:
	src/table/strgen_tables.h
This commit is contained in:
Jonathan G Rennison
2015-08-01 19:57:09 +01:00
133 changed files with 2582 additions and 1718 deletions

View File

@@ -35,6 +35,7 @@
#include "window_func.h"
#include "debug.h"
#include "game/game_text.hpp"
#include "network/network_content_gui.h"
#include <stack>
#include "table/strings.h"
@@ -1873,6 +1874,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang)
SortIndustryTypes();
BuildIndustriesLegend();
SortNetworkLanguages();
BuildContentTypeStringList();
InvalidateWindowClassesData(WC_BUILD_VEHICLE); // Build vehicle window.
InvalidateWindowClassesData(WC_TRAINS_LIST); // Train group window.
InvalidateWindowClassesData(WC_ROADVEH_LIST); // Road vehicle group window.