diff options
| author | rubidium <rubidium@openttd.org> | 2011-02-07 22:08:11 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-02-07 22:08:11 +0000 |
| commit | 750d369a2abd951edcc376f5fc7926de4bb4d5a3 (patch) | |
| tree | 5f0ae8c176bcc98307d36280f3206e19987f880f | |
| parent | 68d03b66e3a85e714bbcce3f3a53b55cfb597ab4 (diff) | |
| download | openttd-750d369a2abd951edcc376f5fc7926de4bb4d5a3.tar.xz | |
(svn r22013) -Codechange: move some functions out of functions.h
| -rw-r--r-- | src/company_func.h | 7 | ||||
| -rw-r--r-- | src/depot_cmd.cpp | 2 | ||||
| -rw-r--r-- | src/functions.h | 7 | ||||
| -rw-r--r-- | src/timetable_cmd.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/company_func.h b/src/company_func.h index d86acbbf3..d612f2873 100644 --- a/src/company_func.h +++ b/src/company_func.h @@ -12,6 +12,7 @@ #ifndef COMPANY_FUNC_H #define COMPANY_FUNC_H +#include "command_type.h" #include "company_type.h" #include "tile_type.h" #include "gfx_type.h" @@ -25,6 +26,12 @@ void CompanyAdminUpdate(const Company *company); void CompanyAdminBankrupt(CompanyID company_id); void UpdateLandscapingLimits(); +bool CheckCompanyHasMoney(CommandCost &cost); +void SubtractMoneyFromCompany(CommandCost cost); +void SubtractMoneyFromCompanyFract(CompanyID company, CommandCost cost); +CommandCost CheckOwnership(Owner owner, TileIndex tile = 0); +CommandCost CheckTileOwnership(TileIndex tile); + extern CompanyByte _local_company; extern CompanyByte _current_company; diff --git a/src/depot_cmd.cpp b/src/depot_cmd.cpp index 159c5bb04..bfc77e3ef 100644 --- a/src/depot_cmd.cpp +++ b/src/depot_cmd.cpp @@ -12,7 +12,7 @@ #include "stdafx.h" #include "command_func.h" #include "depot_base.h" -#include "functions.h" +#include "company_func.h" #include "string_func.h" #include "town.h" #include "vehicle_gui.h" diff --git a/src/functions.h b/src/functions.h index b8cbdd137..656237a7b 100644 --- a/src/functions.h +++ b/src/functions.h @@ -20,13 +20,6 @@ void DrawClearLandTile(const TileInfo *ti, byte set); void DrawClearLandFence(const TileInfo *ti); void TileLoopClearHelper(TileIndex tile); -/* company_cmd.cpp */ -bool CheckCompanyHasMoney(CommandCost &cost); -void SubtractMoneyFromCompany(CommandCost cost); -void SubtractMoneyFromCompanyFract(CompanyID company, CommandCost cost); -CommandCost CheckOwnership(Owner owner, TileIndex tile = 0); -CommandCost CheckTileOwnership(TileIndex tile); - /* misc functions */ void MarkTileDirtyByTile(TileIndex tile); diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp index fbb1ebe24..32fc5feab 100644 --- a/src/timetable_cmd.cpp +++ b/src/timetable_cmd.cpp @@ -11,7 +11,7 @@ #include "stdafx.h" #include "command_func.h" -#include "functions.h" +#include "company_func.h" #include "date_func.h" #include "window_func.h" #include "vehicle_base.h" |