sheepy-clone: comparison hedgewars/uWorld.pas

equal deleted inserted replaced

-:bcbd7adb4e4b
+:0dafbd19a04c
 procedure DrawWorld(Lag: integer; Surface: PSDL_Surface);
 var i, t: integer;
 r: TSDL_Rect;
 team: PTeam;
 begin
-// ����� ����
+// Sky
 inc(RealTicks, Lag);
 r.h:= WorldDy;
 if r.h > 0 then
 begin
 if r.h > cScreenHeight then r.h:= cScreenHeight;
 r.x:= 0;
 r.y:= 0;
 r.w:= cScreenWidth;
 SDL_FillRect(Surface, @r, cSkyColor)
 end;
-// ������ ���
+// background
 for i:= 0 to (cScreenWidth shr 6) do
 DrawGear(sSky, i*64, WorldDy, Surface);
-for i:= -1 to 3 do // ��������
+for i:= -1 to 3 do
 DrawGear(sHorizont, i * 512 + (((WorldDx * 3) div 5) and $1FF), cWaterLine - 256 + WorldDy, Surface);
-// �����
+// Waves
 {$WARNINGS OFF}
 for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx + (RealTicks shr 6)      ) and $FF), cWaterLine + WorldDy - 40, (((GameTicks shr 7) + 2) mod 12), Surface);
 for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx - (RealTicks shr 6) + 192) and $FF), cWaterLine + WorldDy - 30, (((GameTicks shr 7) + 8) mod 12), Surface);
 {$WARNINGS ON}
-// ����
 DrawLand(WorldDx, WorldDy, Surface);
-// ����
+// Water
 r.y:= WorldDy + cWaterLine + 32;
 if r.y < cScreenHeight then
 begin
 r.h:= cScreenHeight - r.y;
 r.x:= 0;
 begin
 for i:= 0 to 7 do
 with team.Hedgehogs[i] do
 if Gear<>nil then
 if Gear.State = 0 then
-begin // ���� �� ��������� ��� �����������
+begin
 DrawCaption( round(Gear.X) + WorldDx,
 round(Gear.Y) - cHHHalfHeight - 30 + WorldDy,
 HealthRect, Surface, true);
 DrawCaption( round(Gear.X) + WorldDx,
 round(Gear.Y) - cHHHalfHeight - 54 + WorldDy,
 NameRect, Surface);
 //                     DrawCaption( round(Gear.X) + WorldDx,
 //                                  round(Gear.Y) - Gear.HalfHeight - 60 + WorldDy,
 //                                  Team.NameRect, Surface);
-end else // ����, ������� ���� ���������
+end else // Current hedgehog
 begin
-if (Gear.State and (gstMoving or gstAttacked or gstDrowning or gstFalling))=0 then // ������ ������ �, ���� ��� ������, ���� �������
+if (Gear.State and (gstMoving or gstAttacked or gstDrowning or gstFalling))=0 then
 if (Gear.State and gstHHThinking) <> 0 then
 DrawGear(sQuestion, Round(Gear.X)  - 10 + WorldDx, Round(Gear.Y) - cHHHalfHeight - 34 + WorldDy, Surface)
 else
 DrawCaption(Round(Gear.X + Sign(Gear.dX) * Sin(Gear.Angle*pi/cMaxAngle)*60) + WorldDx,
 Round(Gear.Y - Cos(Gear.Angle*pi/cMaxAngle)*60) + WorldDy - 5,
 Team.CrossHairRect, Surface)
 end;
 team:= team.Next
 end;
-// �����
+// Waves
 {$WARNINGS OFF}
 for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx + (RealTicks shr 6) +  64) and $FF), cWaterLine + WorldDy - 20, (((GameTicks shr 7) + 4 ) mod 12), Surface);
 for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx - (RealTicks shr 6) + 128) and $FF), cWaterLine + WorldDy - 10, (((GameTicks shr 7) + 10) mod 12), Surface);
 for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx + (RealTicks shr 6)      ) and $FF), cWaterLine + WorldDy     , (((GameTicks shr 7) + 6 ) mod 12), Surface);
 {$WARNINGS ON}
 {$WARNINGS ON}
 DrawSpriteFromRect(r, cScreenWidth - 272, cScreenHeight - 48, 16, 0, Surface);
 end;
 end;
-// ��������� �� ����
+// Target
 if TargetPoint.X <> NoPointX then DrawSprite(sprTargetP, TargetPoint.X + WorldDx - 16, TargetPoint.Y + WorldDy - 16, 0, Surface);
 // Captions
 i:= 0;
 while (i < cMaxCaptions) do
 for i:= 1 to Pred(cMaxCaptions) do
 Captions[Pred(i)]:= Captions[i];
 Captions[Pred(cMaxCaptions)].EndTime:= 0
 end;
-// �������� �� ���
+// Lag alert
 if isInLag then DrawSprite(sprLag, 32, 32  + cConsoleYAdd, (RealTicks shr 7) mod 7, Surface);
-// ������
+// Wind bar
+DrawGear(sWindBar, cScreenWidth - 180, cScreenHeight - 30, Surface);
+if cWindSpeed > 0 then
+begin
+t:= round(72 * cWindSpeed / cMaxWindSpeed);
+with StuffPoz[sWindR] do
+begin
+r.x:= x + 8 - (RealTicks shr 6) mod 8;
+r.y:= y;
+r.w:= t;
+r.h:= 13;
+end;
+DrawSpriteFromRect(r, cScreenWidth - 103, cScreenHeight - 28, 13, 0, Surface);
+end else
+begin
+t:= - round(72 * cWindSpeed / cMaxWindSpeed);
+with StuffPoz[sWindL] do
+begin
+r.x:= x + (RealTicks shr 6) mod 8;
+r.y:= y;
+r.w:= t;
+r.h:= 13;
+end;
+DrawSpriteFromRect(r, cScreenWidth - 106 - t, cScreenHeight - 28, 13, 0, Surface);
+end;
+// Cursor
 if isCursorVisible then DrawSprite(sprArrow, CursorPoint.X, CursorPoint.Y, (RealTicks shr 6) mod 8, Surface);
 {$IFDEF COUNTTICKS}
 DXOutText(10, 10, fnt16, inttostr(cntTicks), Surface);
 {$ENDIF}

changeset 5	0dafbd19a04c
parent 4	bcbd7adb4e4b
child 6	9c1f00e7b43e