# HG changeset patch # User sheepluva # Date 1314298853 -7200 # Node ID bc3d2a58921c99a9a866b7d584194f3c5a8a7387 # Parent 8a5efade0b9373a744d03939761f40da928f5175 * partial rollback of changes to camera * fixed typo in comments diff -r 8a5efade0b93 -r bc3d2a58921c hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Thu Aug 25 18:29:46 2011 +0200 +++ b/hedgewars/GSHandlers.inc Thu Aug 25 21:00:53 2011 +0200 @@ -1556,7 +1556,7 @@ end; CheckCollision(Gear); - // if we haven't found any collision yet then check the otheer side too + // if we haven't found any collision yet then check the other side too if (Gear^.State and gstCollision) = 0 then begin Gear^.dX.isNegative:= not Gear^.dX.isNegative; diff -r 8a5efade0b93 -r bc3d2a58921c hedgewars/uWorld.pas --- a/hedgewars/uWorld.pas Thu Aug 25 18:29:46 2011 +0200 +++ b/hedgewars/uWorld.pas Thu Aug 25 21:00:53 2011 +0200 @@ -1195,8 +1195,8 @@ end else begin - CursorPoint.X:= (prevPoint.X * 7 + hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * (FollowGear^.dX.QWordValue div _0_01.QWordValue) * 2 + WorldDx) div 8; - CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + hwSign(FollowGear^.dY) * (FollowGear^.dY.QWordValue div _0_01.QWordValue) * 2 + WorldDy)) div 8; + CursorPoint.X:= (prevPoint.X * 7 + hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * 100 + WorldDx) div 8; + CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + WorldDy)) div 8; end; wdy:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine - cVisibleWater;