Mercurial Mercurial > hedgewars / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hedgewars/GSHandlers.inc
changeset 1753 2ccba26f1aa4
parent 1752 769986d39202
child 1760 55a1edd97911 
--- a/hedgewars/GSHandlers.inc	Sun Jan 25 18:07:52 2009 +0000
+++ b/hedgewars/GSHandlers.inc	Sun Jan 25 18:10:23 2009 +0000
@@ -390,7 +390,7 @@
 	end;
 dec(i)
 until i = 0;
-if (Gear^.X < _0) or (Gear^.Y < _0) or (Gear^.X > _2048) or (Gear^.Y > _1024) then
+if (Gear^.X < _0) or (Gear^.Y < _0) or (Gear^.X > _4096) or (Gear^.Y > _2048) then // LAND_WIDTH / LAND_HEIGHT 
 	Gear^.doStep:= @doStepShotIdle
 end;
 
@@ -409,7 +409,7 @@
   Gear^.Y:= Gear^.Y + Gear^.dY;
   x:= hwRound(Gear^.X);
   y:= hwRound(Gear^.Y);
-  if ((y and $FFFFFC00) = 0) and ((x and $FFFFF800) = 0)
+  if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0)
      and (Land[y, x] <> 0) then inc(Gear^.Damage);
   if Gear^.Damage > 5 then AmmoShove(Gear, 7, 20);
   dec(i)
@@ -420,7 +420,7 @@
    dec(Gear^.Health, Gear^.Damage);
    Gear^.Damage:= 0
    end;
-if (Gear^.Health <= 0) or (Gear^.X < _0) or (Gear^.Y < _0) or (Gear^.X > _2048) or (Gear^.Y > _1024) then
+if (Gear^.Health <= 0) or (Gear^.X < _0) or (Gear^.Y < _0) or (Gear^.X > _4096) or (Gear^.Y > _2048) then // LAND_WIDTH / LAND_HEIGHT
 	Gear^.doStep:= @doStepShotIdle
 end;
 
@@ -712,7 +712,7 @@
 			begin
 			lx:= hwRound(Gear^.X + mdX * len);
 			ly:= hwRound(Gear^.Y + mdY * len);
-			if ((ly and $FFFFFC00) = 0) and ((lx and $FFFFF800) = 0) and (Land[ly, lx] <> 0) then
+			if ((ly and LAND_HEIGHT_MASK) = 0) and ((lx and LAND_WIDTH_MASK) = 0) and (Land[ly, lx] <> 0) then
 				begin
 				with RopePoints.ar[RopePoints.Count] do
 					begin
@@ -1301,7 +1301,7 @@
 if (GameTicks and $3F) = 0 then
 	AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtSmokeTrace, 0, _0, _0, 0);
 
-if (hwRound(Gear^.X) > 3072) or (hwRound(Gear^.X) < -1024) then DeleteGear(Gear)
+if (hwRound(Gear^.X) > (LAND_WIDTH+1024)) or (hwRound(Gear^.X) < -1024) then DeleteGear(Gear)
 end;
 
 procedure doStepAirAttack(Gear: PGear);
@@ -1777,7 +1777,7 @@
 x:= hwRound(Gear^.X);
 y:= hwRound(Gear^.Y);
 
-if ((y and $FFFFFC00) = 0) and ((x and $FFFFF800) = 0) then
+if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) then
 	if (Land[y, x] <> 0) then
 		begin
 		Gear^.dX.isNegative:= not Gear^.dX.isNegative;
hedgewars