hedgewars: comparison hedgewars/uGearsRender.pas

equal deleted inserted replaced

-:fd29c23ff95e
+:d9de740e194c
 end;
 rounded: array[0..MAXROPEPOINTS + 2] of TVertex2f;
 end;
 implementation
-uses uRender, uRenderUtils, uUtils, uVariables, uAmmos, Math, uVisualGearsList;
+uses uRender, uRenderUtils, uGearsUtils, uUtils, uVariables, uAmmos, Math, uVisualGearsList;
 procedure DrawRopeLinesRQ(Gear: PGear);
 var n: LongInt;
 begin
 with RopePoints do
 end;
 // Render some informational GUI next to hedgehog, like fuel and alternate weapon
 procedure RenderHHGuiExtras(Gear: PGear; ox, oy: LongInt);
 var HH: PHedgehog;
-sx, sy, tx, ty, t, sign, m: LongInt;
+sx, sy, tx, ty, t, hogLR: LongInt;
 dAngle: real;
 begin
 HH:= Gear^.Hedgehog;
 sx:= ox + 1; // this offset is very common
 sy:= oy - 3;
 end;
 // render crosshair
 if (CrosshairGear <> nil) and (Gear = CrosshairGear) then
 begin
-sign:= hwSign(Gear^.dX);
+hogLR:= 1;
-m:= 1;
+if IsHogFacingLeft(Gear) then
-if ((Gear^.State and gstHHHJump) <> 0) and (HH^.Effects[heArtillery] = 0) then
+hogLR:= -1;
-m:= -1;
 setTintAdd(true);
 Tint(HH^.Team^.Clan^.Color shl 8 or $FF);
 DrawTextureRotated(CrosshairTexture,
 12, 12, CrosshairX + WorldDx, CrosshairY + WorldDy, 0,
-sign * m * (Gear^.Angle * 180.0) / cMaxAngle);
+hogLR * (Gear^.Angle * 180.0) / cMaxAngle);
 untint;
 setTintAdd(false);
 end;
 // render gear-related extras: alt weapon, fuel, other
 end;
 procedure DrawHH(Gear: PGear; ox, oy: LongInt);
 var i, t: LongInt;
 amt: TAmmoType;
-sign, hx, hy, tx, ty, sx, sy, m: LongInt;  // hedgehog, crosshair, temp, sprite, direction
+sign, hx, hy, tx, ty, sx, sy, hogLR: LongInt;  // hedgehog, crosshair, temp, sprite, direction
 dx, dy, ax, ay, aAngle, dAngle, hAngle, lx, ly: real;  // laser, change
 wraps: LongWord; // numbe of wraps for laser in world wrap
 defaultPos, HatVisible, inWorldBounds: boolean;
 HH: PHedgehog;
 CurWeapon: PAmmo;
 if HH^.Unplaced then
 exit;
 if (HH^.CurAmmoType = amKnife) and (HH = CurrentHedgehog) then
 curhat:= ChefHatTexture
 else curhat:= HH^.HatTex;
-m:= 1;
-if ((Gear^.State and gstHHHJump) <> 0) and (HH^.Effects[heArtillery] = 0) then
-m:= -1;
 sx:= ox + 1; // this offset is very common
 sy:= oy - 3;
 sign:= hwSign(Gear^.dX);
+if IsHogFacingLeft(Gear) then
+hogLR:= -1
+else
+hogLR:= 1;
 if (Gear^.State and gstHHDeath) <> 0 then
 begin
 DrawSprite(sprHHDeath, ox - 16, oy - 26, Gear^.Pos);
 Tint(HH^.Team^.Clan^.Color shl 8 or $FF);
 1: I need to draw the laser from weapon origin to nearest land
 2: I need to start the beam outside the hedgie for attractiveness.
 3: I need to extend the beam beyond land.
 This routine perhaps should be pushed into uStore or somesuch instead of continuuing the increase in size of this function.
 *)
-dx:= sign * m * Sin(Gear^.Angle * pi / cMaxAngle);
+dx:= hogLR * Sin(Gear^.Angle * pi / cMaxAngle);
 dy:= -Cos(Gear^.Angle * pi / cMaxAngle);
 if cLaserSighting or cLaserSightingSniper then
 begin
-lx:= GetLaunchX(HH^.CurAmmoType, sign * m, Gear^.Angle);
+lx:= GetLaunchX(HH^.CurAmmoType, hogLR, Gear^.Angle);
 ly:= GetLaunchY(HH^.CurAmmoType, Gear^.Angle);
 // ensure we start outside the hedgehog (he's solid after all)
 while abs(lx * lx + ly * ly) < (Gear^.radius * Gear^.radius) do
 begin
 tx:= round(lx + ax * (max(LAND_WIDTH,4096) div 2));
 ty:= round(ly + ay * (max(LAND_WIDTH,4096) div 2));
 break;
 end;
-if ((sign*m < 0) and (tx < LeftX)) or ((sign*m > 0) and (tx >= RightX)) then
+if ((hogLR < 0) and (tx < LeftX)) or ((hogLR > 0) and (tx >= RightX)) then
 if (WorldEdge = weWrap) then
 // wrap beam
 begin
-if (sign*m) < 0 then
+if hogLR < 0 then
 lx:= RightX - (ax - (lx - LeftX))
 else
 lx:= LeftX + (ax - (RightX - lx));
 tx:= round(lx);
 inc(wraps);
 break;
 end;
 inWorldBounds := ((ty and LAND_HEIGHT_MASK) or (tx and LAND_WIDTH_MASK)) = 0;
 end;
-DrawLineWrapped(hx, hy, tx, ty, 1.0, (sign*m) < 0, wraps, $FF, $00, $00, $C0);
+DrawLineWrapped(hx, hy, tx, ty, 1.0, hogLR < 0, wraps, $FF, $00, $00, $C0);
 end;
 // calculate crosshair position
-CrosshairX := Round(hwRound(Gear^.X) + dx * 80 + GetLaunchX(HH^.CurAmmoType, sign * m, Gear^.Angle));
+CrosshairX := Round(hwRound(Gear^.X) + dx * 80 + GetLaunchX(HH^.CurAmmoType, hogLR, Gear^.Angle));
 CrosshairY := Round(hwRound(Gear^.Y) + dy * 80 + GetLaunchY(HH^.CurAmmoType, Gear^.Angle));
 // crosshair will be rendered in RenderHHGuiExtras
 CrosshairGear := Gear;
 end;
 end else
 if ((Gear^.State and gstHHJumping) <> 0) then
 begin
 DrawHedgehog(sx, sy,
-sign*m,
+hogLR,
 1,
 1,
 0);
 HatVisible:= true;
 defaultPos:= false
 if ((Gear^.State and gstHHJumping) <> 0) then
 begin
 DrawHedgehog(sx, sy,
-sign*m,
+hogLR,
 1,
 1,
 0);
 defaultPos:= false
 end;
 DrawTextureF(curhat,
 HatVisibility,
 sx,
 sy - 5,
 0,
-sign*m,
+hogLR,
 32,
 32);
 if (curhat^.w > 64) or ((curhat^.w = 64) and (curhat^.h = 32)) then
 begin
 if ((curhat^.w = 64) and (curhat^.h = 32)) then
 DrawTextureF(curhat,
 HatVisibility,
 sx,
 sy - 5,
 tx,
-sign*m,
+hogLR,
 32,
 32);
 untint
 end
 end

changeset 14994	d9de740e194c
parent 14955	088c1d319612
child 14995	e796e9a88394