diff -r 736479f3d348 -r 71db3c0daa0a hedgewars/uWorld.pas --- a/hedgewars/uWorld.pas Sun Dec 04 00:56:07 2011 +0300 +++ b/hedgewars/uWorld.pas Sun Dec 04 01:00:18 2011 +0300 @@ -82,29 +82,30 @@ cStereo_Water_near = 0.0025; cStereo_Outside = -0.0400; + +// helper functions to create the goal/game mode string +function AddGoal(s: ansistring; gf: longword; si: TGoalStrId; i: LongInt): ansistring; +var t: ansistring; +begin + if (GameFlags and gf) <> 0 then + begin + t:= inttostr(i); + s:= s + format(trgoal[si], t) + '|' + end; + AddGoal:= s; +end; + +function AddGoal(s: ansistring; gf: longword; si: TGoalStrId): ansistring; +begin + if (GameFlags and gf) <> 0 then + s:= s + trgoal[si] + '|'; + AddGoal:= s; +end; + procedure InitWorld; var i, t: LongInt; cp: PClan; g: ansistring; - - // helper functions to create the goal/game mode string - function AddGoal(s: ansistring; gf: longword; si: TGoalStrId; i: LongInt): ansistring; - var t: ansistring; - begin - if (GameFlags and gf) <> 0 then - begin - t:= inttostr(i); - s:= s + format(trgoal[si], t) + '|' - end; - AddGoal:= s; - end; - - function AddGoal(s: ansistring; gf: longword; si: TGoalStrId): ansistring; - begin - if (GameFlags and gf) <> 0 then - s:= s + trgoal[si] + '|'; - AddGoal:= s; - end; begin missionTimer:= 0;