mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r10521) -Fix: some NewGRFs did not check whether the newindustries bit was set, which breaks with a not-yet-finished-implementation of newindustries.
This commit is contained in:
parent
07a1d4379e
commit
6f0db273d6
|
@ -1681,6 +1681,8 @@ static bool SoundEffectChangeInfo(uint sid, int numinfo, int prop, byte **bufp,
|
||||||
|
|
||||||
static bool IndustrytilesChangeInfo(uint indtid, int numinfo, int prop, byte **bufp, int len)
|
static bool IndustrytilesChangeInfo(uint indtid, int numinfo, int prop, byte **bufp, int len)
|
||||||
{
|
{
|
||||||
|
if (!HASBIT(_ttdpatch_flags[3], 0x07)) return true;
|
||||||
|
|
||||||
byte *buf = *bufp;
|
byte *buf = *bufp;
|
||||||
bool ret = false;
|
bool ret = false;
|
||||||
|
|
||||||
|
@ -1793,6 +1795,8 @@ static bool IndustrytilesChangeInfo(uint indtid, int numinfo, int prop, byte **b
|
||||||
|
|
||||||
static bool IndustriesChangeInfo(uint indid, int numinfo, int prop, byte **bufp, int len)
|
static bool IndustriesChangeInfo(uint indid, int numinfo, int prop, byte **bufp, int len)
|
||||||
{
|
{
|
||||||
|
if (!HASBIT(_ttdpatch_flags[3], 0x07)) return true;
|
||||||
|
|
||||||
byte *buf = *bufp;
|
byte *buf = *bufp;
|
||||||
bool ret = false;
|
bool ret = false;
|
||||||
|
|
||||||
|
@ -2923,6 +2927,8 @@ static void TownHouseMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount)
|
||||||
|
|
||||||
static void IndustryMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount)
|
static void IndustryMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount)
|
||||||
{
|
{
|
||||||
|
if (!HASBIT(_ttdpatch_flags[3], 0x07)) return;
|
||||||
|
|
||||||
byte *bp = &buf[4 + idcount + cidcount * 3];
|
byte *bp = &buf[4 + idcount + cidcount * 3];
|
||||||
uint16 groupid = grf_load_word(&bp);
|
uint16 groupid = grf_load_word(&bp);
|
||||||
|
|
||||||
|
@ -2947,6 +2953,8 @@ static void IndustryMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount)
|
||||||
|
|
||||||
static void IndustrytileMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount)
|
static void IndustrytileMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount)
|
||||||
{
|
{
|
||||||
|
if (!HASBIT(_ttdpatch_flags[3], 0x07)) return;
|
||||||
|
|
||||||
byte *bp = &buf[4 + idcount + cidcount * 3];
|
byte *bp = &buf[4 + idcount + cidcount * 3];
|
||||||
uint16 groupid = grf_load_word(&bp);
|
uint16 groupid = grf_load_word(&bp);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue