--- a/hedgewars/GSHandlers.inc Fri Jul 03 22:00:32 2009 +0000
+++ b/hedgewars/GSHandlers.inc Fri Jul 03 22:02:13 2009 +0000
@@ -2219,7 +2219,7 @@
Gear^.Timer:= GameTicks
end;
-// erases 'em all at once :-/
+// erases them all at once :-/
if (Gear^.Timer <> 0) and (GameTicks - Gear^.Timer > 250) then
begin
Gear^.Timer:= 0;
--- a/hedgewars/HHHandlers.inc Fri Jul 03 22:00:32 2009 +0000
+++ b/hedgewars/HHHandlers.inc Fri Jul 03 22:02:13 2009 +0000
@@ -47,7 +47,7 @@
end else
begin
i:= 0;
- // check whether there's ammo in slot
+ // check whether there is ammo in slot
while (i <= cMaxSlotAmmoIndex)
and ((Ammo^[slot, i].Count = 0)
or (Team^.Clan^.TurnNumber <= Ammoz[Ammo^[slot, i].AmmoType].SkipTurns)) do inc(i);
@@ -67,7 +67,7 @@
begin
weap:= TAmmoType(Gear^.MsgParam);
-if PHedgehog(Gear^.Hedgehog)^.Team^.Clan^.TurnNumber <= Ammoz[weap].SkipTurns then exit; // weapon isn't activated yet
+if PHedgehog(Gear^.Hedgehog)^.Team^.Clan^.TurnNumber <= Ammoz[weap].SkipTurns then exit; // weapon is not activated yet
Gear^.MsgParam:= Ammoz[weap].Slot;
@@ -576,7 +576,7 @@
if ((Gear^.State and gstMoving) <> 0)
or (StepTicks = cHHStepTicks)
- or (CurAmmoGear <> nil) then // we're moving
+ or (CurAmmoGear <> nil) then // we are moving
begin
with PHedgehog(Gear^.Hedgehog)^ do
if (CurAmmoGear = nil)
--- a/hedgewars/uAmmos.pas Fri Jul 03 22:00:32 2009 +0000
+++ b/hedgewars/uAmmos.pas Fri Jul 03 22:02:13 2009 +0000
@@ -159,7 +159,7 @@
if (Ammo^[Slot, ami].Count = 0)
and (Ammo^[Slot, ami + 1].Count > 0) then b:= true
else inc(ami);
- if b then // there's a free item in ammo stack
+ if b then // there is a free item in ammo stack
begin
Ammo^[Slot, ami]:= Ammo^[Slot, ami + 1];
Ammo^[Slot, ami + 1].Count:= 0
--- a/hedgewars/uConsts.pas Fri Jul 03 22:00:32 2009 +0000
+++ b/hedgewars/uConsts.pas Fri Jul 03 22:02:13 2009 +0000
@@ -180,8 +180,8 @@
COLOR_INDESTRUCTIBLE = $FF0000FF; // red
// some opengl headers do not have these macros
- GL_BGR = $80E0;
- GL_BGRA = $80E1;
+ GL_BGR = $80E0;
+ GL_BGRA = $80E1;
cifRandomize = $00000001;
cifTheme = $00000002;
--- a/hedgewars/uGears.pas Fri Jul 03 22:00:32 2009 +0000
+++ b/hedgewars/uGears.pas Fri Jul 03 22:02:13 2009 +0000
@@ -655,7 +655,7 @@
procedure ResetUtilities;
var i: LongInt;
begin
- SpeechText:= ''; // in case it hasn't been consumed
+ SpeechText:= ''; // in case it has not been consumed
if (GameFlags and gfLowGravity) = 0 then
cGravity:= cMaxWindSpeed;
--- a/hedgewars/uLand.pas Fri Jul 03 22:00:32 2009 +0000
+++ b/hedgewars/uLand.pas Fri Jul 03 22:02:13 2009 +0000
@@ -77,10 +77,7 @@
if digest = '' then
digest:= s
else
-{$IFNDEF IPHONEOS}
-//HACK & FIXME!!!
TryDo(s = digest, 'Different maps generated, sorry', true)
-{$ENDIF}
end;
procedure DrawLine(X1, Y1, X2, Y2: LongInt; Color: Longword);