petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r16554) -Fix (r16433): compilation with disabled network was broken

Browse Source
This commit is contained in:
smatz
2009-06-10 18:53:43 +00:00
parent 5a6bb53894
commit 3eb8f643fb
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings.cpp
View File

@@ -1523,6 +1523,7 @@ void SetDefaultCompanySettings(CompanyID cid)
} }
} }
#if defined(ENABLE_NETWORK)
/** /**
* Sync all company settings in a multiplayer game. * Sync all company settings in a multiplayer game.
*/ */
@@ -1538,6 +1539,7 @@ void SyncCompanySettings()
if (old_value != new_value) NetworkSend_Command(0, i, new_value, CMD_CHANGE_COMPANY_SETTING, NULL, NULL); if (old_value != new_value) NetworkSend_Command(0, i, new_value, CMD_CHANGE_COMPANY_SETTING, NULL, NULL);
} }
} }
#endif /* ENABLE_NETWORK */
/** /**
* Get the index in the _company_settings array of a setting * Get the index in the _company_settings array of a setting

7
src/settings_func.h
View File

@@ -26,7 +26,12 @@ void SaveGRFPresetToConfig(const char *config_name, struct GRFConfig *config);
void DeleteGRFPresetFromConfig(const char *config_name); void DeleteGRFPresetFromConfig(const char *config_name);
uint GetCompanySettingIndex(const char *name); uint GetCompanySettingIndex(const char *name);
void SyncCompanySettings();
void SetDefaultCompanySettings(CompanyID cid); void SetDefaultCompanySettings(CompanyID cid);
#if defined(ENABLE_NETWORK)
void SyncCompanySettings();
#else /* ENABLE_NETWORK */
static inline void SyncCompanySettings() {}
#endif /* ENABLE_NETWORK */
#endif /* SETTINGS_FUNC_H */ #endif /* SETTINGS_FUNC_H */