diff options
| author | frosch <frosch@openttd.org> | 2010-01-17 01:01:56 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2010-01-17 01:01:56 +0000 |
| commit | d9d75c83d5b0839d335db453b4482fcaf306bac7 (patch) | |
| tree | ad207b20db255982fe6d12d77b480c3d918ad5be /src/newgrf.cpp | |
| parent | 707cf045f8703700887757ecfa4e309b61e2fd4f (diff) | |
| download | openttd-d9d75c83d5b0839d335db453b4482fcaf306bac7.tar.xz | |
(svn r18842) -Codechange: Rename SPRITE_MODIFIER_USE_OFFSET to SPRITE_MODIFIER_CUSTOM_SPRITE, invert its meaning, and also use it for industry/house layouts instead of IS_CUSTOM_SPRITE().
Diffstat (limited to 'src/newgrf.cpp')
| -rw-r--r-- | src/newgrf.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 45d9fab37..5e4a5abdc 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -1139,8 +1139,9 @@ static ChangeInfoResult StationChangeInfo(uint stid, int numinfo, int prop, byte dts->ground.pal = grf_load_word(&buf); if (dts->ground.sprite == 0) continue; if (HasBit(dts->ground.pal, 15)) { + /* Use sprite from Action 1 */ ClrBit(dts->ground.pal, 15); - SetBit(dts->ground.sprite, SPRITE_MODIFIER_USE_OFFSET); + SetBit(dts->ground.sprite, SPRITE_MODIFIER_CUSTOM_SPRITE); } MapSpriteMappingRecolour(&dts->ground); @@ -1160,10 +1161,11 @@ static ChangeInfoResult StationChangeInfo(uint stid, int numinfo, int prop, byte dtss->image.sprite = grf_load_word(&buf); dtss->image.pal = grf_load_word(&buf); - /* Remap flags as ours collide */ if (HasBit(dtss->image.pal, 15)) { ClrBit(dtss->image.pal, 15); - SetBit(dtss->image.sprite, SPRITE_MODIFIER_USE_OFFSET); + } else { + /* Use sprite from Action 1 (yes, this is inverse to above) */ + SetBit(dtss->image.sprite, SPRITE_MODIFIER_CUSTOM_SPRITE); } MapSpriteMappingRecolour(&dtss->image); @@ -2937,6 +2939,7 @@ static void NewSpriteGroup(byte *buf, size_t len) SpriteID sprite = _cur_grffile->spriteset_start + spriteset * num_spriteset_ents; SB(group->dts->ground.sprite, 0, SPRITE_WIDTH, sprite); ClrBit(group->dts->ground.pal, 15); + SetBit(group->dts->ground.sprite, SPRITE_MODIFIER_CUSTOM_SPRITE); } } @@ -2964,6 +2967,7 @@ static void NewSpriteGroup(byte *buf, size_t len) SpriteID sprite = _cur_grffile->spriteset_start + spriteset * num_spriteset_ents; SB(seq->image.sprite, 0, SPRITE_WIDTH, sprite); ClrBit(seq->image.pal, 15); + SetBit(seq->image.sprite, SPRITE_MODIFIER_CUSTOM_SPRITE); } } |