hedgewars/uLandGraphics.pas
branchios-develop
changeset 13418 ba39a1d396c0
parent 13410 4c813650fe17
child 13468 f1d349a52bc7
equal deleted inserted replaced
13416:6e8b807bda4b 13418:ba39a1d396c0
   793                     end;
   793                     end;
   794                 if (not behind) or (Land[cpY + y, cpX + x] and lfLandMask = 0) then
   794                 if (not behind) or (Land[cpY + y, cpX + x] and lfLandMask = 0) then
   795                     begin
   795                     begin
   796                     if (LandFlags and lfBasic <> 0) or 
   796                     if (LandFlags and lfBasic <> 0) or 
   797                        ((LandPixels[gY, gX] and AMask shr AShift > 128) and  // This test assumes lfBasic and lfObject differ only graphically
   797                        ((LandPixels[gY, gX] and AMask shr AShift > 128) and  // This test assumes lfBasic and lfObject differ only graphically
   798                          (LandFlags and lfObject = 0)) then
   798                          (LandFlags and (lfObject or lfIce) = 0)) then
   799                          Land[cpY + y, cpX + x]:= lfBasic or LandFlags
   799                          Land[cpY + y, cpX + x]:= lfBasic or LandFlags
   800                     else Land[cpY + y, cpX + x]:= lfObject or LandFlags
   800                     else if (LandFlags and lfIce = 0) then
       
   801 						 Land[cpY + y, cpX + x]:= lfObject or LandFlags
       
   802 					else Land[cpY + y, cpX + x]:= LandFlags
   801                     end;
   803                     end;
   802                 if (not behind) or (LandPixels[gY, gX] = 0) then
   804                 if (not behind) or (LandPixels[gY, gX] = 0) then
   803                     begin
   805                     begin
   804                     if tint = $FFFFFFFF then
   806                     if tint = $FFFFFFFF then
   805                         LandPixels[gY, gX]:= PLongword(@(p^[x * 4]))^
   807                         LandPixels[gY, gX]:= PLongword(@(p^[x * 4]))^