changeset 17273:f4995212309f draft

(svn r22013) -Codechange: move some functions out of functions.h
author rubidium <rubidium@openttd.org>
date Mon, 07 Feb 2011 22:08:11 +0000
parents c5ca71da7bb1
children 8409d573b661
files src/company_func.h src/depot_cmd.cpp src/functions.h src/timetable_cmd.cpp
diffstat 4 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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 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;
 
--- 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"
--- a/src/functions.h
+++ b/src/functions.h
@@ -20,13 +20,6 @@
 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);
 
--- 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"