mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r22885) [1.1] -Backport from trunk: 

- Fix: [NewGRF] Variables 40 and 81 of callback 18 are not the same as 80 (r22867)
- Fix: [NewGRF] Generic callbacks shall chain to the next GRF when the callback fails (r22866, r22865)
release/1.1
frosch 2011-09-03 18:51:59 +00:00
parent 7d984241f3
commit 0ca913841d
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/newgrf_generic.cpp
View File

@ -85,10 +85,10 @@ static void GenericCallbackSetTriggers(const ResolverObject *object, int trigger
static uint32 GenericCallbackGetVariable(const ResolverObject *object, byte variable, byte parameter, bool *available) static uint32 GenericCallbackGetVariable(const ResolverObject *object, byte variable, byte parameter, bool *available)
{ {
switch (variable) { switch (variable) {
case 0x40: return object->u.generic.cargo_type; case 0x40: return object->grffile->cargo_map[object->u.generic.cargo_type];
case 0x80: return object->u.generic.cargo_type; case 0x80: return object->u.generic.cargo_type;
case 0x81: return object->u.generic.cargo_type; case 0x81: return CargoSpec::Get(object->u.generic.cargo_type)->bitnum;
case 0x82: return object->u.generic.default_selection; case 0x82: return object->u.generic.default_selection;
case 0x83: return object->u.generic.src_industry; case 0x83: return object->u.generic.src_industry;
case 0x84: return object->u.generic.dst_industry; case 0x84: return object->u.generic.dst_industry;
@ -115,7 +115,7 @@ static const SpriteGroup *GenericCallbackResolveReal(const ResolverObject *objec
} }
static inline void NewGenericResolver(ResolverObject *res, const GRFFile *grffile) static inline void NewGenericResolver(ResolverObject *res)
{ {
res->GetRandomBits = &GenericCallbackGetRandomBits; res->GetRandomBits = &GenericCallbackGetRandomBits;
res->GetTriggers = &GenericCallbackGetTriggers; res->GetTriggers = &GenericCallbackGetTriggers;
@ -127,8 +127,6 @@ static inline void NewGenericResolver(ResolverObject *res, const GRFFile *grffil
res->callback_param1 = 0; res->callback_param1 = 0;
res->callback_param2 = 0; res->callback_param2 = 0;
res->ResetState(); res->ResetState();
res->grffile = grffile;
} }
@ -137,7 +135,8 @@ static inline void NewGenericResolver(ResolverObject *res, const GRFFile *grffil
* answer * answer
* @param feature GRF Feature of callback * @param feature GRF Feature of callback
* @param object pre-populated resolver object * @param object pre-populated resolver object
* @param file address of GRFFile object if file reference is needed, NULL is valid * @param [out] file Optionally returns the GRFFile which made the final decision for the callback result.
* May be NULL if not required.
* @return callback value if successful or CALLBACK_FAILED * @return callback value if successful or CALLBACK_FAILED
*/ */
static uint16 GetGenericCallbackResult(uint8 feature, ResolverObject *object, const GRFFile **file) static uint16 GetGenericCallbackResult(uint8 feature, ResolverObject *object, const GRFFile **file)
@ -147,8 +146,9 @@ static uint16 GetGenericCallbackResult(uint8 feature, ResolverObject *object, co
/* Test each feature callback sprite group. */ /* Test each feature callback sprite group. */
for (GenericCallbackList::const_iterator it = _gcl[feature].begin(); it != _gcl[feature].end(); ++it) { for (GenericCallbackList::const_iterator it = _gcl[feature].begin(); it != _gcl[feature].end(); ++it) {
const SpriteGroup *group = it->group; const SpriteGroup *group = it->group;
object->grffile = it->file;
group = SpriteGroup::Resolve(group, object); group = SpriteGroup::Resolve(group, object);
if (group == NULL) continue; if (group == NULL || group->GetCallbackResult() == CALLBACK_FAILED) continue;
/* Return NewGRF file if necessary */ /* Return NewGRF file if necessary */
if (file != NULL) *file = it->file; if (file != NULL) *file = it->file;
@ -163,12 +163,25 @@ static uint16 GetGenericCallbackResult(uint8 feature, ResolverObject *object, co
/** /**
* 'Execute' an AI purchase selection callback * 'Execute' an AI purchase selection callback
*
* @param feature GRF Feature to call callback for.
* @param cargo_type Cargotype to pass to callback. (Variable 80)
* @param default_selection 'Default selection' to pass to callback. (Variable 82)
* @param src_industry 'Source industry type' to pass to callback. (Variable 83)
* @param dst_industry 'Destination industry type' to pass to callback. (Variable 84)
* @param distance 'Distance between source and destination' to pass to callback. (Variable 85)
* @param event 'AI construction event' to pass to callback. (Variable 86)
* @param count 'Construction number' to pass to callback. (Variable 87)
* @param station_size 'Station size' to pass to callback. (Variable 88)
* @param [out] file Optionally returns the GRFFile which made the final decision for the callback result.
* May be NULL if not required.
* @return callback value if successful or CALLBACK_FAILED
*/ */
uint16 GetAiPurchaseCallbackResult(uint8 feature, CargoID cargo_type, uint8 default_selection, IndustryType src_industry, IndustryType dst_industry, uint8 distance, AIConstructionEvent event, uint8 count, uint8 station_size, const GRFFile **file) uint16 GetAiPurchaseCallbackResult(uint8 feature, CargoID cargo_type, uint8 default_selection, IndustryType src_industry, IndustryType dst_industry, uint8 distance, AIConstructionEvent event, uint8 count, uint8 station_size, const GRFFile **file)
{ {
ResolverObject object; ResolverObject object;
NewGenericResolver(&object, *file); NewGenericResolver(&object);
if (src_industry != IT_AI_UNKNOWN && src_industry != IT_AI_TOWN) { if (src_industry != IT_AI_UNKNOWN && src_industry != IT_AI_TOWN) {
const IndustrySpec *is = GetIndustrySpec(src_industry); const IndustrySpec *is = GetIndustrySpec(src_industry);