diff -r 69cc0166be8d -r 555a8d8db228 hedgewars/uUtils.pas --- a/hedgewars/uUtils.pas Thu Apr 19 23:36:20 2012 +0400 +++ b/hedgewars/uUtils.pas Fri Apr 20 01:50:47 2012 +0400 @@ -26,12 +26,14 @@ procedure SplitBySpace(var a, b: shortstring); procedure SplitByChar(var a, b: ansistring; c: char); +{$IFNDEF PAS2C} function EnumToStr(const en : TGearType) : shortstring; overload; function EnumToStr(const en : TVisualGearType) : shortstring; overload; function EnumToStr(const en : TSound) : shortstring; overload; function EnumToStr(const en : TAmmoType) : shortstring; overload; function EnumToStr(const en : THogEffect) : shortstring; overload; function EnumToStr(const en : TCapGroup) : shortstring; overload; +{$ENDIF} function Min(a, b: LongInt): LongInt; inline; function Max(a, b: LongInt): LongInt; inline; @@ -42,7 +44,7 @@ function DxDy2Angle(const _dY, _dX: hwFloat): GLfloat; function DxDy2Angle32(const _dY, _dX: hwFloat): LongInt; function DxDy2AttackAngle(const _dY, _dX: hwFloat): LongInt; -function DxDy2AttackAngle(const _dY, _dX: extended): LongInt; +function DxDy2AttackAnglef(const _dY, _dX: extended): LongInt; procedure SetLittle(var r: hwFloat); @@ -102,6 +104,7 @@ end else b:= ''; end; +{$IFNDEF PAS2C} function EnumToStr(const en : TGearType) : shortstring; overload; begin EnumToStr:= GetEnumName(TypeInfo(TGearType), ord(en)) @@ -130,7 +133,7 @@ begin EnumToStr := GetEnumName(TypeInfo(TCapGroup), ord(en)) end; - +{$ENDIF} function Min(a, b: LongInt): LongInt; begin @@ -198,9 +201,9 @@ DxDy2AttackAngle:= trunc(arctan2(dY, dX) * MaxAngleDivPI) end; -function DxDy2AttackAngle(const _dY, _dX: extended): LongInt; inline; +function DxDy2AttackAnglef(const _dY, _dX: extended): LongInt; inline; begin -DxDy2AttackAngle:= trunc(arctan2(_dY, _dX) * (cMaxAngle/pi)) +DxDy2AttackAnglef:= trunc(arctan2(_dY, _dX) * (cMaxAngle/pi)) end;