diff options
author | smatz <smatz@openttd.org> | 2009-12-19 23:53:15 +0000 |
---|---|---|
committer | smatz <smatz@openttd.org> | 2009-12-19 23:53:15 +0000 |
commit | a608fbaf7ffb487444b2e029bb7677af8e172699 (patch) | |
tree | 85ac6e321cb114ded6373b6b03f2ac98eb5a9815 /src/ai/api/ai_company.hpp | |
parent | 64478eb9600c9402c8e508ba912e973930b13de8 (diff) | |
download | openttd-a608fbaf7ffb487444b2e029bb7677af8e172699.tar.xz |
(svn r18557) -Fix: (most of) gcc errors when using lto caused by some structs having different definition in different object files
Diffstat (limited to 'src/ai/api/ai_company.hpp')
-rw-r--r-- | src/ai/api/ai_company.hpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/ai/api/ai_company.hpp b/src/ai/api/ai_company.hpp index 890956757..d32579ef8 100644 --- a/src/ai/api/ai_company.hpp +++ b/src/ai/api/ai_company.hpp @@ -23,14 +23,10 @@ public: /** Different constants related to CompanyID. */ enum CompanyID { - COMPANY_INVALID = -1, //!< An invalid company. - -#ifdef DEFINE_SCRIPT_FILES - COMPANY_FIRST = 0, //!< The first available company. + COMPANY_FIRST = 0, //!< The first available company. COMPANY_LAST = ::MAX_COMPANIES, //!< The last available company. -#endif /* DEFINE_SCRIPT_FILES */ - - COMPANY_SELF = 254, //!< Constant that gets resolved to the correct company index for your company. + COMPANY_SELF = 254, //!< Constant that gets resolved to the correct company index for your company. + COMPANY_INVALID = -1, //!< An invalid company. }; /** Possible genders for company presidents. */ |