hedgewars: comparison hedgewars/uWorld.pas

equal deleted inserted replaced

-:20a2d5e6930a
+:dc587913987c
 uCursor.init();
 prevPoint.X:= 0;
 prevPoint.Y:= cScreenHeight div 2;
 //prevTargetPoint.X:= 0;
 //prevTargetPoint.Y:= 0;
-WorldDx:=  -(LAND_WIDTH div 2);// + cScreenWidth div 2;
+WorldDx:=  -(LongInt(leftX + (playWidth div 2))); // -(LAND_WIDTH div 2);// + cScreenWidth div 2;
 WorldDy:=  -(LAND_HEIGHT - (playHeight div 2)) + (cScreenHeight div 2);
 //aligns it to the bottom of the screen, minus the border
 SkyOffset:= 0;
 HorizontOffset:= 0;
 end;
 // for uStore texture resetting
 procedure ResetWorldTex;
 begin
-FreeTexture(fpsTexture);
+FreeAndNilTexture(fpsTexture);
-fpsTexture:= nil;
+FreeAndNilTexture(timeTexture);
-FreeTexture(timeTexture);
+FreeAndNilTexture(missionTex);
-timeTexture:= nil;
+FreeAndNilTexture(recTexture);
-FreeTexture(missionTex);
+FreeAndNilTexture(AmmoMenuTex);
-missionTex:= nil;
-FreeTexture(recTexture);
-recTexture:= nil;
-FreeTexture(AmmoMenuTex);
 AmmoMenuInvalidated:= true;
-AmmoMenuTex:= nil;
 end;
 function GetAmmoMenuTexture(Ammo: PHHAmmo): PTexture;
 const BORDERSIZE = 2;
 var x, y, i, t, SlotsNumY, SlotsNumX, AMFrame: LongInt;
 //Init the menu
 if(AmmoMenuInvalidated) then
 begin
 AmmoMenuInvalidated:= false;
-FreeTexture(AmmoMenuTex);
+FreeAndNilTexture(AmmoMenuTex);
 AmmoMenuTex:= GetAmmoMenuTexture(Ammo);
 {$IFDEF USE_LANDSCAPE_AMMOMENU}
 if isPhone() then
 begin
 if bSelected and (Ammoz[Ammo^[Slot, Pos].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber < 0) then
 begin
 bShowAmmoMenu:= false;
 SetWeapon(Ammo^[Slot, Pos].AmmoType);
 bSelected:= false;
-FreeWeaponTooltip;
+FreeAndNilTexture(WeaponTooltipTex);
 {$IFDEF USE_TOUCH_INTERFACE}//show the aiming buttons + animation
 if (Ammo^[Slot, Pos].Propz and ammoprop_NeedUpDown) <> 0 then
 begin
 if (not arrowUp.show) then
 begin
 exit
 end;
 end
 end
 else
-FreeWeaponTooltip;
+FreeAndNilTexture(WeaponTooltipTex);
 if (WeaponTooltipTex <> nil) and (AMShiftX = 0) and (AMShiftY = 0) then
 {$IFDEF USE_LANDSCAPE_AMMOMENU}
 if (not isPhone()) then
 ShowWeaponTooltip(-WeaponTooltipTex^.w div 2, AmmoRect.y - WeaponTooltipTex^.h - AMSlotSize);
 if w > 0 then
 begin
 rect.w:= w;
 rect.x:= ViewLeftX;
-DrawRect(rect, $30, $30, $30, $40, true);
+DrawRect(rect, $10, $10, $10, $80, true);
 if WorldEdge = weBounce then
 DrawLineOnScreen(tmp - 1, ViewTopY, tmp - 1, ViewBottomY, 2, $54, $54, $FF, $FF);
 end;
 tmp:= LongInt(rightX) + WorldDx;
 if w > 0 then
 begin
 rect.w:= w;
 rect.x:= tmp;
-DrawRect(rect, $30, $30, $30, $40, true);
+DrawRect(rect, $10, $10, $10, $80, true);
 if WorldEdge = weBounce then
 DrawLineOnScreen(tmp - 1, ViewTopY, tmp - 1, ViewBottomY, 2, $54, $54, $FF, $FF);
 end;
 (*
 s:= inttostr(i div 60) + ':' + s;
 tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(s), cWhiteColorChannels);
 tmpSurface:= doSurfaceConversion(tmpSurface);
-FreeTexture(timeTexture);
+FreeAndNilTexture(timeTexture);
 timeTexture:= Surface2Tex(tmpSurface, false);
 SDL_FreeSurface(tmpSurface)
 end;
 if timeTexture <> nil then
 Frames:= 0;
 CountTicks:= 0;
 s:= inttostr(FPS) + ' fps';
 tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(s), cWhiteColorChannels);
 tmpSurface:= doSurfaceConversion(tmpSurface);
-FreeTexture(fpsTexture);
+FreeAndNilTexture(fpsTexture);
 fpsTexture:= Surface2Tex(tmpSurface, false);
 SDL_FreeSurface(tmpSurface)
 end;
 if fpsTexture <> nil then
 DrawTexture((cScreenWidth shr 1) - 60 - offsetY, offsetX, fpsTexture);
 if recTexture = nil then
 begin
 s:= 'rec';
 tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fntBig].Handle, Str2PChar(s), cWhiteColorChannels);
 tmpSurface:= doSurfaceConversion(tmpSurface);
-FreeTexture(recTexture);
+FreeAndNilTexture(recTexture);
 recTexture:= Surface2Tex(tmpSurface, false);
 SDL_FreeSurface(tmpSurface)
 end;
 DrawTexture( -(cScreenWidth shr 1) + 50, 20, recTexture);
 {$IFNDEF MOBILE}
 if (not (CurrentTeam^.ExtDriven and isCursorVisible and (not bShowAmmoMenu) and autoCameraOn)) and cHasFocus and (GameState <> gsConfirm) then
 uCursor.updatePosition();
 {$ENDIF}
 z:= round(200/zoom);
-inbtwnTrgtAttks := (CurrentHedgehog <> nil) and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget) <> 0) and ((GameFlags and gfInfAttack) <> 0);
+inbtwnTrgtAttks := ((GameFlags and gfInfAttack) <> 0) and (CurrentHedgehog <> nil) and ((CurrentHedgehog^.Gear = nil) or (CurrentHedgehog^.Gear <> FollowGear)) and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget) <> 0);
 if autoCameraOn and (not PlacingHogs) and (FollowGear <> nil) and (not isCursorVisible) and (not bShowAmmoMenu) and (not fastUntilLag) and (not inbtwnTrgtAttks) then
 if ((abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y)) > 4) then
 begin
 FollowGear:= nil;
 prevPoint:= CursorPoint;
 exit
 end
 else
 begin
-if abs(prevPoint.X - WorldDx - hwRound(FollowGear^.X)) > LongInt(rightX) - leftX - 100 then
+if (WorldEdge = weWrap) then
+cameraJump:= LongInt(playWidth) div 2 + 50
+else
+cameraJump:= LongInt(rightX) - leftX - 100;
+if abs(prevPoint.X - WorldDx - hwRound(FollowGear^.X)) > cameraJump then
 begin
-if (prevPoint.X - WorldDx) * 2 < LongInt((rightX + leftX)) then
+if prevPoint.X - WorldDx < LongInt(playWidth div 2) then
-cameraJump:= LongInt(rightX) - leftX
+cameraJump:= LongInt(playWidth)
 else
-cameraJump:= LongInt(leftX) - rightX;
+cameraJump:= -LongInt(playWidth);
 WorldDx:= WorldDx - cameraJump;
 end;
 CursorPoint.X:= (prevPoint.X * 7 + hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * z + WorldDx) div 8;
 r.h:= 32;
 if time = 0 then
 time:= 5000;
 missionTimer:= time;
-FreeTexture(missionTex);
+FreeAndNilTexture(missionTex);
 if icon > -1 then
 begin
 r.x:= 0;
 r.y:= icon * 32;

branch	qmlfrontend
changeset 10748	dc587913987c
parent 10672	c2004c3e9c7d
child 10818	f642a28cab0c