--- a/CMakeLists.txt Sat Jul 23 09:31:57 2011 +0400
+++ b/CMakeLists.txt Wed Jul 27 11:41:43 2011 +0400
@@ -24,7 +24,7 @@
OUTPUT_VARIABLE version_suffix
)
STRING(REGEX REPLACE "[^+]" "" HGCHANGED ${version_suffix})
- STRING(REGEX REPLACE "([0-9a-zA-Z]+)(.*) ([0-9]+)(.*)" "\\3:\\1" version_suffix ${version_suffix})
+ STRING(REGEX REPLACE "([0-9a-zA-Z]+)(.*) ([0-9]+)(.*)" "\\3-\\1" version_suffix ${version_suffix})
IF (HGCHANGED)
MESSAGE(STATUS "Building revision ${version_suffix} (SOURCE CODE MODIFIED)")
ELSE()
--- a/hedgewars/uAIActions.pas Sat Jul 23 09:31:57 2011 +0400
+++ b/hedgewars/uAIActions.pas Wed Jul 27 11:41:43 2011 +0400
@@ -158,7 +158,7 @@
end
else if hwRound(Me^.X) < Param then
begin
- OutError('AI: WaitXL assert (' + IntToStr(hwRound(Me^.X)) + ' < ' + IntToStr(Param) + ')', false);
+ //OutError('AI: WaitXL assert (' + IntToStr(hwRound(Me^.X)) + ' < ' + IntToStr(Param) + ')', false);
FreeActionsList;
exit
end
@@ -171,7 +171,7 @@
end
else if hwRound(Me^.X) > Param then
begin
- OutError('AI: WaitXR assert (' + IntToStr(hwRound(Me^.X)) + ' > ' + IntToStr(Param) + ')', false);
+ //OutError('AI: WaitXR assert (' + IntToStr(hwRound(Me^.X)) + ' > ' + IntToStr(Param) + ')', false);
FreeActionsList;
exit
end
--- a/hedgewars/uAIMisc.pas Sat Jul 23 09:31:57 2011 +0400
+++ b/hedgewars/uAIMisc.pas Wed Jul 27 11:41:43 2011 +0400
@@ -302,7 +302,6 @@
begin
bRes:= false;
GoInfo.Ticks:= 0;
-GoInfo.FallPix:= 0;
GoInfo.JumpType:= jmpNone;
bX:= hwRound(Gear^.X);
bY:= hwRound(Gear^.Y);
@@ -371,9 +370,7 @@
function HHGo(Gear, AltGear: PGear; var GoInfo: TGoInfo): boolean;
var pX, pY: LongInt;
- bRes: boolean;
begin
-bRes:= false;
AltGear^:= Gear^;
GoInfo.Ticks:= 0;
@@ -391,7 +388,7 @@
begin
Goinfo.FallPix:= 0;
HHJump(AltGear, jmpLJump, GoInfo); // try ljump instead of fall with damage
- exit(bRes)
+ exit(false)
end;
Gear^.Y:= Gear^.Y + Gear^.dY;
if hwRound(Gear^.Y) > pY then inc(GoInfo.FallPix);
@@ -400,14 +397,13 @@
inc(GoInfo.Ticks, 410);
Gear^.State:= Gear^.State and not (gstMoving or gstHHJumping);
Gear^.dY:= _0;
- bRes:= true;
HHJump(AltGear, jmpLJump, GoInfo); // try ljump instead of fall
- exit(bRes)
+ exit(true)
end;
continue
end;
if (Gear^.Message and gmLeft )<>0 then Gear^.dX:= -cLittle else
- if (Gear^.Message and gmRight )<>0 then Gear^.dX:= cLittle else exit(bRes);
+ if (Gear^.Message and gmRight )<>0 then Gear^.dX:= cLittle else exit(false);
if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
begin
if not (TestCollisionXwithXYShift(Gear, _0, -6, hwSign(Gear^.dX))
@@ -463,7 +459,7 @@
exit(true);
until (pX = hwRound(Gear^.X)) and (pY = hwRound(Gear^.Y)) and ((Gear^.State and gstMoving) = 0);
HHJump(AltGear, jmpHJump, GoInfo);
-HHGo:= bRes;
+HHGo:= false;
end;
function AIrndSign(num: LongInt): LongInt;