equal
deleted
inserted
replaced
948 if (dts->ground_sprite == 0) continue; |
948 if (dts->ground_sprite == 0) continue; |
949 if (HasBit(dts->ground_pal, 15)) { |
949 if (HasBit(dts->ground_pal, 15)) { |
950 ClrBit(dts->ground_pal, 15); |
950 ClrBit(dts->ground_pal, 15); |
951 SetBit(dts->ground_sprite, SPRITE_MODIFIER_USE_OFFSET); |
951 SetBit(dts->ground_sprite, SPRITE_MODIFIER_USE_OFFSET); |
952 } |
952 } |
|
953 if (HasBit(dts->ground_pal, 14)) { |
|
954 ClrBit(dts->ground_pal, 14); |
|
955 SetBit(dts->ground_sprite, SPRITE_MODIFIER_OPAQUE); |
|
956 } |
953 if (HasBit(dts->ground_sprite, 15)) { |
957 if (HasBit(dts->ground_sprite, 15)) { |
954 ClrBit(dts->ground_sprite, 15); |
958 ClrBit(dts->ground_sprite, 15); |
955 SetBit(dts->ground_sprite, PALETTE_MODIFIER_COLOR); |
959 SetBit(dts->ground_sprite, PALETTE_MODIFIER_COLOR); |
956 } |
960 } |
957 if (HasBit(dts->ground_sprite, 14)) { |
961 if (HasBit(dts->ground_sprite, 14)) { |
978 |
982 |
979 /* Remap flags as ours collide */ |
983 /* Remap flags as ours collide */ |
980 if (HasBit(dtss->pal, 15)) { |
984 if (HasBit(dtss->pal, 15)) { |
981 ClrBit(dtss->pal, 15); |
985 ClrBit(dtss->pal, 15); |
982 SetBit(dtss->image, SPRITE_MODIFIER_USE_OFFSET); |
986 SetBit(dtss->image, SPRITE_MODIFIER_USE_OFFSET); |
|
987 } |
|
988 if (HasBit(dtss->pal, 14)) { |
|
989 ClrBit(dtss->pal, 14); |
|
990 SetBit(dtss->image, SPRITE_MODIFIER_OPAQUE); |
983 } |
991 } |
984 |
992 |
985 if (HasBit(dtss->image, 15)) { |
993 if (HasBit(dtss->image, 15)) { |
986 ClrBit(dtss->image, 15); |
994 ClrBit(dtss->image, 15); |
987 SetBit(dtss->image, PALETTE_MODIFIER_COLOR); |
995 SetBit(dtss->image, PALETTE_MODIFIER_COLOR); |