hedgewars: comparison hedgewars/uWorld.pas

equal deleted inserted replaced

-:c3ccec3834e8
+:29bc9c36ad5f
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 *)
 unit uWorld;
 interface
-uses SDLh, uGears, uConsts;
+uses SDLh, uGears, uConsts, uFloat;
 {$INCLUDE options.inc}
 const WorldDx: integer = -512;
 WorldDy: integer = -256;
 procedure InitWorld;
 bShowFinger: boolean = false;
 Frames: Longword = 0;
 implementation
 uses uStore, uMisc, uTeams, uIO, uConsole, uKeys, uLocale, uSound;
-const RealTicks: Longword = 0;
+const hwFloatTicks: Longword = 0;
 FPS: Longword = 0;
 CountTicks: Longword = 0;
 SoundTimerTicks: Longword = 0;
 prevPoint: TPoint = (X: 0; Y: 0);
 end;
 if CurrentTeam = nil then exit;
 Slot:= 0;
 Pos:= -1;
-with CurrentTeam.Hedgehogs[CurrentTeam.CurrHedgehog] do
+with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog] do
 begin
 if Ammo = nil then exit;
 SlotsNum:= 0;
 x:= AMxCurr;
 y:= cScreenHeight - 40;
 dec(y);
 DrawSprite(sprAMBorders, x, y, 1, Surface);
 dec(y, 33);
 DrawSprite(sprAMSlotName, x, y, 0, Surface);
 for i:= cMaxSlotIndex downto 0 do
-if Ammo[i, 0].Count > 0 then
+if Ammo^[i, 0].Count > 0 then
 begin
 if (CursorPoint.Y >= y - 33) and (CursorPoint.Y < y) then Slot:= i;
 dec(y, 33);
 inc(SlotsNum);
 DrawSprite(sprAMSlot, x, y, 0, Surface);
 DrawSprite(sprAMSlotKeys, x + 2, y + 1, i, Surface);
 t:= 0;
-while (t <= cMaxSlotAmmoIndex) and (Ammo[i, t].Count > 0) do
+while (t <= cMaxSlotAmmoIndex) and (Ammo^[i, t].Count > 0) do
 begin
-DrawSprite(sprAMAmmos, x + t * 33 + 35, y + 1, integer(Ammo[i, t].AmmoType), Surface);
+DrawSprite(sprAMAmmos, x + t * 33 + 35, y + 1, integer(Ammo^[i, t].AmmoType), Surface);
 if (Slot = i) and (CursorPoint.X >= x + t * 33 + 35) and (CursorPoint.X < x + t * 33 + 68) then
 begin
 DrawSprite(sprAMSelection, x + t * 33 + 35, y + 1, 0, Surface);
 Pos:= t;
 end;
 end;
 dec(y, 1);
 DrawSprite(sprAMBorders, x, y, 0, Surface);
 if (Pos >= 0) then
-if Ammo[Slot, Pos].Count > 0 then
+if Ammo^[Slot, Pos].Count > 0 then
 begin
-DXOutText(AMxCurr + 10, cScreenHeight - 68, fnt16, trAmmo[Ammoz[Ammo[Slot, Pos].AmmoType].NameId], Surface);
+DXOutText(AMxCurr + 10, cScreenHeight - 68, fnt16, trAmmo[Ammoz[Ammo^[Slot, Pos].AmmoType].NameId], Surface);
-if Ammo[Slot, Pos].Count < 10 then
+if Ammo^[Slot, Pos].Count < 10 then
-DXOutText(AMxCurr + 175, cScreenHeight - 68, fnt16, chr(Ammo[Slot, Pos].Count + 48) + 'x', Surface);
+DXOutText(AMxCurr + 175, cScreenHeight - 68, fnt16, chr(Ammo^[Slot, Pos].Count + 48) + 'x', Surface);
 if bSelected then
 begin
 bShowAmmoMenu:= false;
-SetWeapon(Ammo[Slot, Pos].AmmoType);
+SetWeapon(Ammo^[Slot, Pos].AmmoType);
 bSelected:= false;
 exit
 end;
 end;
 end;
 bSelected:= false;
-if AMxLeft = AMxCurr then DrawSprite(sprArrow, CursorPoint.X, CursorPoint.Y, (RealTicks shr 6) mod 8, Surface)
+if AMxLeft = AMxCurr then DrawSprite(sprArrow, CursorPoint.X, CursorPoint.Y, (hwFloatTicks shr 6) mod 8, Surface)
 end;
 procedure MoveCamera; forward;
 procedure DrawWorld(Lag: integer; Surface: PSDL_Surface);
 begin
 if not isPaused then MoveCamera;
 // Sky
-inc(RealTicks, Lag);
+inc(hwFloatTicks, Lag);
 if WorldDy > 0 then
 begin
 if WorldDy > cScreenHeight then r.h:= cScreenHeight
 else r.h:= WorldDy;
 r.x:= 0;
 DrawRepeated(sprSky, WorldDx * 3 div 8);
 DrawRepeated(sprHorizont, WorldDx * 3 div 5);
 // Waves
 {$WARNINGS OFF}
-for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx + (RealTicks shr 6)      ) and $FF), cWaterLine + WorldDy - 64, 0, Surface);
+for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx + (hwFloatTicks shr 6)      ) and $FF), cWaterLine + WorldDy - 64, 0, Surface);
-for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx - (RealTicks shr 6) + 192) and $FF), cWaterLine + WorldDy - 48, 0, Surface);
+for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx - (hwFloatTicks shr 6) + 192) and $FF), cWaterLine + WorldDy - 48, 0, Surface);
 {$WARNINGS ON}
 DrawLand(WorldDx, WorldDy, Surface);
 // Water
 r.y:= WorldDy + cWaterLine + 32;
 DrawGears(Surface);
 // Waves
 {$WARNINGS OFF}
-for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx + (RealTicks shr 6) +  64) and $FF), cWaterLine + WorldDy - 32, 0, Surface);
+for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx + (hwFloatTicks shr 6) +  64) and $FF), cWaterLine + WorldDy - 32, 0, Surface);
-for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx - (RealTicks shr 6) + 128) and $FF), cWaterLine + WorldDy - 16, 0, Surface);
+for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx - (hwFloatTicks shr 6) + 128) and $FF), cWaterLine + WorldDy - 16, 0, Surface);
-for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx + (RealTicks shr 6)      ) and $FF), cWaterLine + WorldDy     , 0, Surface);
+for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx + (hwFloatTicks shr 6)      ) and $FF), cWaterLine + WorldDy     , 0, Surface);
 {$WARNINGS ON}
 // Turn time
 if TurnTimeLeft <> 0 then
 begin
 if CurrentTeam <> nil then
 case AttackBar of
 1: begin
 r:= StuffPoz[sPowerBar];
 {$WARNINGS OFF}
-r.w:= (CurrentTeam.Hedgehogs[CurrentTeam.CurrHedgehog].Gear.Power * 256) div cPowerDivisor;
+r.w:= (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^.Power * 256) div cPowerDivisor;
 {$WARNINGS ON}
 DrawSpriteFromRect(r, cScreenWidth - 272, cScreenHeight - 48, 16, 0, Surface);
 end;
-2: with CurrentTeam.Hedgehogs[CurrentTeam.CurrHedgehog] do
+2: with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog] do
 begin
-tdx:= hwSign(Gear.dX) * Sin(Gear.Angle*pi/cMaxAngle);
+tdx:= hwSign(Gear^.dX) * Sin(Gear^.Angle * Pi / cMaxAngle);
-tdy:= - Cos(Gear.Angle*pi/cMaxAngle);
+tdy:= - Cos(Gear^.Angle * Pi / cMaxAngle);
-for i:= (Gear.Power * 24) div cPowerDivisor downto 0 do
+for i:= (Gear^.Power * 24) div cPowerDivisor downto 0 do
-DrawSprite(sprPower, round(Gear.X + WorldDx + tdx * (24 + i * 2)) - 16,
+DrawSprite(sprPower, Gear^.X.Round + system.round(WorldDx + tdx * (24 + i * 2)) - 16,
-round(Gear.Y + WorldDy + tdy * (24 + i * 2)) - 12,
+Gear^.Y.Round + system.round(WorldDy + tdy * (24 + i * 2)) - 12,
 i, Surface)
 end
 end;
 // Target
 for grp:= Low(TCapGroup) to High(TCapGroup) do
 with Captions[grp] do
 if Surf <> nil then
 begin
 DrawCentered(cScreenWidth div 2, i + cConsoleYAdd, Surf, Surface);
-inc(i, Surf.h + 2);
+inc(i, Surf^.h + 2);
-if EndTime <= RealTicks then
+if EndTime <= hwFloatTicks then
 begin
 SDL_FreeSurface(Surf);
 Surf:= nil;
 EndTime:= 0
 end
 // Teams Healths
 team:= TeamsList;
 while team <> nil do
 begin
-r.x:= cScreenWidth div 2 - team.NameTag.w - 3;
+r.x:= cScreenWidth div 2 - team^.NameTag^.w - 3;
-r.y:= team.DrawHealthY;
+r.y:= team^.DrawHealthY;
-r.w:= team.NameTag.w;
+r.w:= team^.NameTag^.w;
-r.h:= team.NameTag.h;
+r.h:= team^.NameTag^.h;
-SDL_UpperBlit(team.NameTag, nil, Surface, @r);
+SDL_UpperBlit(team^.NameTag, nil, Surface, @r);
-r:= team.HealthRect;
+r:= team^.HealthRect;
-r.w:= 2 + team.TeamHealthBarWidth;
+r.w:= 2 + team^.TeamHealthBarWidth;
 DrawFromStoreRect(cScreenWidth div 2,
-Team.DrawHealthY,
+Team^.DrawHealthY,
 @r, Surface);
 inc(r.x, cTeamHealthWidth + 2);
 r.w:= 3;
-DrawFromStoreRect(cScreenWidth div 2 + team.TeamHealthBarWidth + 2,
+DrawFromStoreRect(cScreenWidth div 2 + team^.TeamHealthBarWidth + 2,
-Team.DrawHealthY,
+Team^.DrawHealthY,
 @r, Surface);
-team:= team.Next
+team:= team^.Next
 end;
 // Lag alert
-if isInLag then DrawSprite(sprLag, 32, 32  + cConsoleYAdd, (RealTicks shr 7) mod 7, Surface);
+if isInLag then DrawSprite(sprLag, 32, 32  + cConsoleYAdd, (hwFloatTicks shr 7) mod 7, Surface);
 // Wind bar
 DrawGear(sWindBar, cScreenWidth - 180, cScreenHeight - 30, Surface);
 if WindBarWidth > 0 then
 begin
 with StuffPoz[sWindR] do
 begin
 {$WARNINGS OFF}
-r.x:= x + 8 - (RealTicks shr 6) mod 8;
+r.x:= x + 8 - (hwFloatTicks shr 6) mod 8;
 {$WARNINGS ON}
 r.y:= y;
 r.w:= WindBarWidth;
 r.h:= 13;
 end;
 if WindBarWidth < 0 then
 begin
 with StuffPoz[sWindL] do
 begin
 {$WARNINGS OFF}
-r.x:= x + (WindBarWidth + RealTicks shr 6) mod 8;
+r.x:= x + (WindBarWidth + hwFloatTicks shr 6) mod 8;
 {$WARNINGS ON}
 r.y:= y;
 r.w:= - WindBarWidth;
 r.h:= 13;
 end;
 // AmmoMenu
 if (AMxCurr < cScreenWidth) or bShowAmmoMenu then ShowAmmoMenu(Surface);
 // Cursor
-if isCursorVisible then DrawSprite(sprArrow, CursorPoint.X, CursorPoint.Y, (RealTicks shr 6) mod 8, Surface);
+if isCursorVisible then DrawSprite(sprArrow, CursorPoint.X, CursorPoint.Y, (hwFloatTicks shr 6) mod 8, Surface);
 {$IFDEF COUNTTICKS}
 DXOutText(10, 10, fnt16, inttostr(cntTicks), Surface);
 {$ENDIF}
 FPS:= Frames;
 Frames:= 0;
 CountTicks:= 0;
 s:= inttostr(FPS) + ' fps';
 if fpsSurface <> nil then SDL_FreeSurface(fpsSurface);
-fpsSurface:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, PChar(String(s)), $FFFFFF);
+fpsSurface:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(s), $FFFFFF);
 end;
 r.x:= cScreenWidth - 50;
 r.y:= 10;
 SDL_UpperBlit(fpsSurface, nil, Surface, @r)
 end;
 begin
 if Group in [capgrpGameState, capgrpNetSay] then WriteLnToConsole(s);
 if Captions[Group].Surf <> nil then SDL_FreeSurface(Captions[Group].Surf);
 Captions[Group].Surf:= RenderString(s, Color, fntBig);
-Captions[Group].EndTime:= RealTicks + 1500
+Captions[Group].EndTime:= hwFloatTicks + 1500
 end;
 procedure MoveCamera;
 const PrevSentPointTime: LongWord = 0;
 var EdgesDist: integer;
 begin
-if not (CurrentTeam.ExtDriven and isCursorVisible) then SDL_GetMouseState(@CursorPoint.X, @CursorPoint.Y);
+if not (CurrentTeam^.ExtDriven and isCursorVisible) then SDL_GetMouseState(@CursorPoint.X, @CursorPoint.Y);
 if (FollowGear <> nil) then
 if abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y) > 4 then
 begin
 FollowGear:= nil;
 exit
 end
 else begin
-CursorPoint.x:= (CursorPoint.x * 7 + (round(FollowGear.X + hwSign(FollowGear.dX) * 100) + WorldDx)) div 8;
+CursorPoint.x:= (CursorPoint.x * 7 + (hwRound(FollowGear^.X + hwSign(FollowGear^.dX) * 100) + WorldDx)) div 8;
-CursorPoint.y:= (CursorPoint.y * 7 + (round(FollowGear.Y) + WorldDy)) div 8
+CursorPoint.y:= (CursorPoint.y * 7 + (hwRound(FollowGear^.Y) + WorldDy)) div 8
 end;
 if ((CursorPoint.X = prevPoint.X)and(CursorPoint.Y = prevpoint.Y)) then exit;
 if AMxCurr < cScreenWidth then
 exit
 end;
 if isCursorVisible then
 begin
-if (not CurrentTeam.ExtDriven)and(GameTicks >= PrevSentPointTime + cSendCursorPosTime) then
+if (not CurrentTeam^.ExtDriven)and(GameTicks >= PrevSentPointTime + cSendCursorPosTime) then
 begin
 SendIPCXY('P', CursorPoint.X - WorldDx, CursorPoint.Y - WorldDy);
 PrevSentPointTime:= GameTicks
 end;
 end;
 if isCursorVisible or (FollowGear <> nil) then
 begin
 if isCursorVisible then EdgesDist:= cCursorEdgesDist
 else EdgesDist:= cGearScrEdgesDist;
 if CursorPoint.X < EdgesDist then
 WorldDx:= WorldDx - CursorPoint.X + prevPoint.X;
 WorldDy:= WorldDy - CursorPoint.Y + prevPoint.Y;
 CursorPoint.X:= (cScreenWidth  shr 1);
 CursorPoint.Y:= (cScreenHeight shr 1);
 end;
 if cHasFocus then SDL_WarpMouse(CursorPoint.X, CursorPoint.Y);
 prevPoint:= CursorPoint;
 if WorldDy < cScreenHeight - cWaterLine - cVisibleWater then WorldDy:= cScreenHeight - cWaterLine - cVisibleWater;
 if WorldDy >  2048 then WorldDy:=  2048;
 if WorldDx < -2048 then WorldDx:= -2048;

changeset 351	29bc9c36ad5f
parent 308	806c3b55500d
child 371	731ad6d27bd1