sheepy-clone: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:1e332947147c
+:ac1691d35cf2
 Gear^.doStep := @doStepDrowningGear;
 Gear^.State := Gear^.State and (not gstHHDriven);
 AddCaption(Format(GetEventString(eidDrowned), Gear^.Hedgehog^.Name), cWhiteColor, capgrpMessage);
 end
 end
-else
+else if Gear^.Kind = gtFlake then
-Gear^.doStep := @doStepDrowningGear
+begin
+DeleteGear(Gear);
+exit
+end
+else Gear^.doStep := @doStepDrowningGear
 end;
 if ((not isSubmersible) and (hwRound(Gear^.Y) < cWaterLine + 64 + Gear^.Radius)) or
 (isSubmersible and (hwRound(Gear^.Y) < cWaterLine + 2 + Gear^.Radius) and ((CurAmmoGear^.Pos = 0) and (CurAmmoGear^.dY < _0_01))) then
 // don't play splash if they are already way past the surface
 PlaySound(sndSplash)
 end
 end;
 procedure doStepSnowflake(Gear: PGear);
 var xx, yy, px, py, i: LongInt;
-move, draw, allpx: Boolean;
+move, draw, allpx, gun: Boolean;
 s: PSDL_Surface;
 p: PLongwordArray;
 oAlpha, nAlpha: byte;
 begin
+gun:= (Gear^.State and gstTmpFlag) <> 0;
 move:= false;
 draw:= false;
-if (Gear^.State and gstTmpFlag) <> 0 then
+if gun then
 begin
 doStepFallingGear(Gear);
 CheckCollision(Gear);
 if ((Gear^.State and gstCollision) <> 0) or ((Gear^.State and gstMoving) = 0) then draw:= true;
 xx:= hwRound(Gear^.X);
 // we've collided with land. draw some stuff and get back into the clouds
 move:= true;
 if (CurAmmoGear = nil) or (CurAmmoGear^.Kind <> gtRope) then
 begin
 ////////////////////////////////// TODO - ASK UNC0RR FOR A GOOD HOME FOR THIS ////////////////////////////////////
-if (State and gstTmpFlag) = 0 then
+if not gun then
 begin
 dec(yy,3);
 dec(xx,1)
 end;
 s:= SpritesData[sprSnow].Surface;
 for py:= 0 to Pred(s^.h) do
 begin
 for px:= 0 to Pred(s^.w) do
 if ((((yy + py) and LAND_HEIGHT_MASK) = 0) and (((xx + px) and LAND_WIDTH_MASK) = 0)) and ((Land[yy + py, xx + px] and $FF) = 0) then
 begin
+if gun then
+begin
+// try to avoid speckles. might need disabling
+LandDirty[yy div 32, xx div 32]:= 1;
+Land[yy + py, xx + px]:= Land[yy + py, xx + px] or lfDamaged;
+end;
 Land[yy + py, xx + px]:= Land[yy + py, xx + px] or lfObject;
 if (cReducedQuality and rqBlurryLand) = 0 then
 begin
-if (State and gstTmpFlag) <> 0 then
+if gun then
-LandPixels[yy + py, xx + px]:= addBgColor(LandPixels[yy + py, xx + px], (cExplosionBorderColor and $00FFFFFF) or (p^[px] and $FF000000))
+LandPixels[yy + py, xx + px]:= (cExplosionBorderColor and $00FFFFFF) or (p^[px] and $FF000000)
 else LandPixels[yy + py, xx + px]:= addBgColor(LandPixels[yy + py, xx + px], p^[px]);
 end
 else
 begin
-if (State and gstTmpFlag) <> 0 then
+if gun then
-LandPixels[(yy + py) div 2, (xx + px) div 2]:= addBgColor(LandPixels[(yy + py) div 2, (xx + px) div 2], (cExplosionBorderColor and $00FFFFFF) or (p^[px] and $FF000000))
+LandPixels[(yy + py) div 2, (xx + px) div 2]:= (cExplosionBorderColor and $00FFFFFF) or (p^[px] and $FF000000)
 else LandPixels[(yy + py) div 2, (xx + px) div 2]:= addBgColor(LandPixels[(yy + py) div 2, (xx + px) div 2], p^[px]);
 end;
 end
 else allpx:= false;
 p:= @(p^[s^.pitch shr 2])
 end
 end;
 if move then
 begin
-if ((Gear^.State and gstTmpFlag) <> 0) then
+if gun then
 begin
 DeleteGear(Gear);
 exit
 end;
 Gear^.X:= int2hwFloat(GetRandom(LAND_WIDTH+1024)-512);
 end;
 Gear^.Timer:= Gear^.Tag
 end;
-if (Gear^.Health = 0) or (HHGear^.Damage <> 0) then
+if (Gear^.Health = 0) or (HHGear^.Damage <> 0) or ((HHGear^.Message and gmAttack) <> 0) then
 begin
+HHGear^.Message:= HHGear^.Message and not gmAttack;
 DeleteGear(Gear);
 AfterAttack
 end
 else
 begin
 procedure doStepLandGun(Gear: PGear);
 var
 HHGear: PGear;
 begin
 HHGear := Gear^.Hedgehog^.Gear;
-HHGear^.Message := HHGear^.Message and not (gmUp or gmDown or gmLeft or gmRight);
+HHGear^.Message := HHGear^.Message and not (gmUp or gmDown or gmLeft or gmRight or gmAttack);
 HHGear^.State := HHGear^.State or gstNotKickable;
 Gear^.doStep := @doStepLandGunWork
 end;
 procedure doStepPoisonCloud(Gear: PGear);

changeset 5025	ac1691d35cf2
parent 5024	1e332947147c
child 5041	3dc6ad20cbfe