Merge branch 'master' into jgrpp-beta
# Conflicts: # src/economy.cpp # src/lang/traditional_chinese.txt # src/order_gui.cpp # src/settings.cpp # src/settings_internal.h # src/table/company_settings.ini # src/table/currency_settings.ini # src/table/gameopt_settings.ini # src/table/misc_settings.ini # src/table/settings.h.preamble # src/table/settings.ini # src/table/win32_settings.ini # src/table/window_settings.ini
This commit is contained in:
@@ -249,6 +249,6 @@ void ShowNewGRFSettings(bool editable, bool show_params, bool exec_changes, GRFC
|
||||
GRFTextWrapper FindUnknownGRFName(uint32 grfid, uint8 *md5sum, bool create);
|
||||
|
||||
void UpdateNewGRFScanStatus(uint num, const char *name);
|
||||
bool UpdateNewGRFConfigPalette(int32 p1 = 0);
|
||||
void UpdateNewGRFConfigPalette(int32 new_value = 0);
|
||||
|
||||
#endif /* NEWGRF_CONFIG_H */
|
||||
|
Reference in New Issue
Block a user