cpp/openttd-patchpack/source Changeset - r18294:67a72ead8996

Changeset - r18294:67a72ead8996

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

frosch - 13 years ago 2011-11-08 17:24:15
frosch@openttd.org

(svn r23140) -Add: ErrorUnknownCallbackResult()

4 files changed with 40 insertions and 0 deletions:

src/lang/english.txt

src/newgrf_commons.cpp

src/newgrf_commons.h

src/newgrf_config.h

0 comments (0 inline, 0 general)

src/lang/english.txt

➞

Show inline comments

@@ @@ -2517,12 +2517,13 @@ STR_NEWGRF_BROKEN_POWERED_WAGON @@
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}It changed vehicle length for '{1:ENGINE}' when not inside a depot
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Train '{VEHICLE}' belonging to '{COMPANY}' has invalid length. It is probably caused by problems with NewGRFs. Game may desync or crash
 STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{0:RAW_STRING}' provides incorrect information
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Cargo/refit information for '{1:ENGINE}' differs from purchase list after construction. This might cause autorenew/-replace to fail refitting correctly
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' caused an endless loop in the production callback
 STR_NEWGRF_BUGGY_UNKNOWN_CALLBACK_RESULT                        :{WHITE}Callback 0x{HEX} returned unknown/invalid result 0x{HEX}
 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<invalid cargo>
 STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??
 STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} of <invalid cargo>
 STR_NEWGRF_INVALID_ENGINE                                       :<invalid vehicle model>

src/newgrf_commons.cpp

➞

Show inline comments

@@ @@ -10,26 +10,30 @@ @@
 /**
  * @file newgrf_commons.cpp Implementation of the class OverrideManagerBase
  * and its descendance, present and futur
  */
 #include "stdafx.h"
 #include "debug.h"
 #include "landscape.h"
 #include "house.h"
 #include "industrytype.h"
 #include "newgrf.h"
 #include "newgrf_config.h"
 #include "clear_map.h"
 #include "station_map.h"
 #include "tree_map.h"
 #include "tunnelbridge_map.h"
 #include "newgrf_object.h"
 #include "genworld.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_text.h"
 #include "livery.h"
 #include "company_base.h"
 #include "gui.h"
 #include "strings_func.h"
 #include "table/strings.h"
 /**
  * Constructor of generic class
  * @param offset end of original data for this entity. i.e: houses = 110
@@ @@ -492,12 +496,44 @@ CommandCost GetErrorMessageFromLocationC @@
 	/* Copy some parameters from the registers to the error message text ref. stack */
 	res.UseTextRefStack(4);
 	return res;
+}
 /**
  * Record that a NewGRF returned an unknown/invalid callback result.
  * Also show an error to the user.
  * @param grfid ID of the NewGRF causing the problem.
  * @param cbid Callback causing the problem.
  * @param cb_res Invalid result returned by the callback.
  */
 void ErrorUnknownCallbackResult(uint32 grfid, uint16 cbid, uint16 cb_res)
+{
 	GRFConfig *grfconfig = GetGRFConfig(grfid);
 	if (!HasBit(grfconfig->grf_bugs, GBUG_UNKNOWN_CB_RESULT)) {
 		SetBit(grfconfig->grf_bugs, GBUG_UNKNOWN_CB_RESULT);
 		SetDParamStr(0, grfconfig->GetName());
 		SetDParam(1, cbid);
 		SetDParam(2, cb_res);
 		ShowErrorMessage(STR_NEWGRF_BUGGY, STR_NEWGRF_BUGGY_UNKNOWN_CALLBACK_RESULT, WL_CRITICAL);
+	}
 	/* debug output */
 	char buffer[512];
 	SetDParamStr(0, grfconfig->GetName());
 	GetString(buffer, STR_NEWGRF_BUGGY, lastof(buffer));
 	DEBUG(grf, 0, "%s", buffer + 3);
 	SetDParam(1, cbid);
 	SetDParam(2, cb_res);
 	GetString(buffer, STR_NEWGRF_BUGGY_UNKNOWN_CALLBACK_RESULT, lastof(buffer));
 	DEBUG(grf, 0, "%s", buffer + 3);
+}
 /* static */ SmallVector<DrawTileSeqStruct, 8> NewGRFSpriteLayout::result_seq;
 /**
  * Clone the building sprites of a spritelayout.
  * @param source The building sprites to copy.
  */

src/newgrf_commons.h

➞

Show inline comments

@@ @@ -297,12 +297,14 @@ extern ObjectOverrideManager _object_mng @@
 uint32 GetTerrainType(TileIndex tile, TileContext context = TCX_NORMAL);
 TileIndex GetNearbyTile(byte parameter, TileIndex tile, bool signed_offsets = true, Axis axis = INVALID_AXIS);
 uint32 GetNearbyTileInformation(TileIndex tile);
 uint32 GetCompanyInfo(CompanyID owner, const struct Livery *l = NULL);
 CommandCost GetErrorMessageFromLocationCallbackResult(uint16 cb_res, uint32 grfid, StringID default_error);
 void ErrorUnknownCallbackResult(uint32 grfid, uint16 cbid, uint16 cb_res);
 /**
  * Data related to the handling of grf files.
  * @tparam Tcnt Number of spritegroups
  */
 template <size_t Tcnt>
 struct GRFFilePropsBase {

src/newgrf_config.h

➞

Show inline comments

@@ @@ -41,12 +41,13 @@ enum GRFStatus { @@
 /** Encountered GRF bugs */
 enum GRFBugs {
 	GBUG_VEH_LENGTH,        ///< Length of rail vehicle changes when not inside a depot
 	GBUG_VEH_REFIT,         ///< Articulated vehicles carry different cargos resp. are differently refittable than specified in purchase list
 	GBUG_VEH_POWERED_WAGON, ///< Powered wagon changed poweredness state when not inside a depot
 	GBUG_UNKNOWN_CB_RESULT, ///< A callback returned an unknown/invalid result
 };
 /** Status of post-gameload GRF compatibility check */
 enum GRFListCompatibility {
 	GLC_ALL_GOOD,   ///< All GRF needed by game are present
 	GLC_COMPATIBLE, ///< Compatible (eg. the same ID, but different chacksum) GRF found in at least one case

0 comments (0 inline, 0 general)