(svn r23924) -Fix [FS#5054]: [NoGo] "Some" news messages would cause an assertion to be triggered due to a missing proper location for the viewport of the news message, so only allow building when valid data for the viewport is provided or no viewport is used

This commit is contained in:
rubidium
2012-02-11 19:42:33 +00:00
parent 37439fda68
commit 48e1ec7d60
2 changed files with 26 additions and 16 deletions

View File

@@ -22,26 +22,11 @@
class ScriptNews : public ScriptObject {
public:
/**
* Enumeration for corners of tiles.
* Enumeration for the news types that a script can create news for.
*/
enum NewsType {
/* Note: these values represent part of the in-game NewsSubtype enum */
NT_ARRIVAL_COMPANY = ::NS_ARRIVAL_COMPANY, ///< Category arrival for own company.
NT_ARRIVAL_OTHER = ::NS_ARRIVAL_OTHER, ///< Category arrival for other companies.
NT_ACCIDENT = ::NS_ACCIDENT, ///< Category accident.
NT_COMPANY_TROUBLE = ::NS_COMPANY_TROUBLE, ///< Category company in trouble.
NT_COMPANY_MERGER = ::NS_COMPANY_MERGER, ///< Category company merger.
NT_COMPANY_BANKRUPT = ::NS_COMPANY_BANKRUPT, ///< Category company bankrupt.
NT_COMPANY_NEW = ::NS_COMPANY_NEW, ///< Category company new.
NT_INDUSTRY_OPEN = ::NS_INDUSTRY_OPEN, ///< Category industry open.
NT_INDUSTRY_CLOSE = ::NS_INDUSTRY_CLOSE, ///< Category industry close.
NT_ECONOMY = ::NS_ECONOMY, ///< Category economy.
NT_INDUSTRY_COMPANY = ::NS_INDUSTRY_COMPANY, ///< Category industry changes for own company.
NT_INDUSTRY_OTHER = ::NS_INDUSTRY_OTHER, ///< Category industry changes for other companies.
NT_INDUSTRY_NOBODY = ::NS_INDUSTRY_NOBODY, ///< Category industry changes for nobody.
NT_ADVICE = ::NS_ADVICE, ///< Category advice.
NT_NEW_VEHICLES = ::NS_NEW_VEHICLES, ///< Category new vehicle.
NT_ACCEPTANCE = ::NS_ACCEPTANCE, ///< Category acceptance changes.
NT_SUBSIDIES = ::NS_SUBSIDIES, ///< Category subsidies.
NT_GENERAL = ::NS_GENERAL, ///< Category general.
};