(svn r7759) -Merge: makefile rewrite. This merge features:

 - A proper ./configure, so everything needs to be configured only once, not for every make.
 - Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
 - A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
 - Proper support for OSX universal binaries.
 - Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
 - Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.

Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.

1 files changed, 70 insertions, 0 deletions

diff --git a/src/economy.h b/src/economy.h
new file mode 100644
index 000000000..823e167c8
--- /dev/null
+++ b/src/economy.h
@@ -0,0 +1,70 @@
+/* $Id$ */
+
+#ifndef ECONOMY_H
+#define ECONOMY_H
+
+void ResetPriceBaseMultipliers(void);
+void SetPriceBaseMultiplier(uint price, byte factor);
+
+typedef struct {
+	// Maximum possible loan
+	int32 max_loan;
+	int32 max_loan_unround;
+	// Economy fluctuation status
+	int fluct;
+	// Interest
+	byte interest_rate;
+	byte infl_amount;
+	byte infl_amount_pr;
+} Economy;
+
+VARDEF Economy _economy;
+
+typedef struct Subsidy {
+	CargoID cargo_type;
+	byte age;
+	/* from and to can either be TownID, StationID or IndustryID */
+	uint16 from;
+	uint16 to;
+} Subsidy;
+
+
+enum {
+	SCORE_VEHICLES   = 0,
+	SCORE_STATIONS   = 1,
+	SCORE_MIN_PROFIT = 2,
+	SCORE_MIN_INCOME = 3,
+	SCORE_MAX_INCOME = 4,
+	SCORE_DELIVERED  = 5,
+	SCORE_CARGO      = 6,
+	SCORE_MONEY      = 7,
+	SCORE_LOAN       = 8,
+	SCORE_TOTAL      = 9, // This must always be the last entry
+
+	NUM_SCORE = 10, // How many scores are there..
+
+	SCORE_MAX = 1000 // The max score that can be in the performance history
+	//  the scores together of score_info is allowed to be more!
+};
+
+typedef struct ScoreInfo {
+	byte id;    // Unique ID of the score
+	int needed; // How much you need to get the perfect score
+	int score;  // How much score it will give
+} ScoreInfo;
+
+extern const ScoreInfo _score_info[];
+extern int _score_part[MAX_PLAYERS][NUM_SCORE];
+
+int UpdateCompanyRatingAndValue(Player *p, bool update);
+
+VARDEF Subsidy _subsidies[MAX_PLAYERS];
+Pair SetupSubsidyDecodeParam(const Subsidy* s, bool mode);
+void DeleteSubsidyWithTown(TownID index);
+void DeleteSubsidyWithIndustry(IndustryID index);
+void DeleteSubsidyWithStation(StationID index);
+
+int32 GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, CargoID cargo_type);
+uint MoveGoodsToStation(TileIndex tile, int w, int h, int type, uint amount);
+
+#endif /* ECONOMY_H */