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

(svn r24528) -Fix: [NewGRF] RandomAction 84 should interpret register 100 as signed.

release/1.3
frosch 2012-09-16 16:31:53 +00:00
parent e37e2d92a6
commit 38f265c083
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/newgrf_engine.cpp
View File

@ -349,12 +349,19 @@ static inline const Vehicle *GRV(const ResolverObject *object)
case VSG_SCOPE_PARENT: return object->u.vehicle.parent; case VSG_SCOPE_PARENT: return object->u.vehicle.parent;
case VSG_SCOPE_RELATIVE: { case VSG_SCOPE_RELATIVE: {
if (object->u.vehicle.self == NULL) return NULL; if (object->u.vehicle.self == NULL) return NULL;
int32 count = GB(object->count, 0, 4);
if (count == 0) count = GetRegister(0x100);
const Vehicle *v = NULL; const Vehicle *v = NULL;
switch (GB(object->count, 6, 2)) { switch (GB(object->count, 6, 2)) {
default: NOT_REACHED(); default: NOT_REACHED();
case 0x00: // count back (away from the engine), starting at this vehicle case 0x00: // count back (away from the engine), starting at this vehicle
v = object->u.vehicle.self;
break;
case 0x01: // count forward (toward the engine), starting at this vehicle case 0x01: // count forward (toward the engine), starting at this vehicle
v = object->u.vehicle.self; v = object->u.vehicle.self;
count = -count;
break; break;
case 0x02: // count back, starting at the engine case 0x02: // count back, starting at the engine
v = object->u.vehicle.parent; v = object->u.vehicle.parent;
@ -372,10 +379,7 @@ static inline const Vehicle *GRV(const ResolverObject *object)
break; break;
} }
} }
uint32 count = GB(object->count, 0, 4); return v->Move(count);
if (count == 0) count = GetRegister(0x100);
while (v != NULL && count-- != 0) v = (GB(object->count, 6, 2) == 0x01) ? v->Previous() : v->Next();
return v;
} }
} }
} }

16
src/vehicle_base.h
View File

@ -533,6 +533,22 @@ public:
return v; return v;
} }
/**
* Get the vehicle at offset \a n of this vehicle chain.
* @param n Offset from the current vehicle.
* @return The new vehicle or NULL if the offset is out-of-bounds.
*/
inline const Vehicle *Move(int n) const
{
const Vehicle *v = this;
if (n < 0) {
for (int i = 0; i != n && v != NULL; i--) v = v->Previous();
} else {
for (int i = 0; i != n && v != NULL; i++) v = v->Next();
}
return v;
}
/** /**
* Get the first order of the vehicles order list. * Get the first order of the vehicles order list.
* @return first order of order list. * @return first order of order list.