# HG changeset patch
# User unc0rr
# Date 1126559817 0
# Node ID a6bed8d31444d066c377e72876052674cddb8080
# Parent  b6f4b413dd4168c1465afe2b7f05f01ab77cdbda
minor code review

diff -r b6f4b413dd41 -r a6bed8d31444 hedgewars/uAI.pas
--- a/hedgewars/uAI.pas	Sun Sep 11 21:02:11 2005 +0000
+++ b/hedgewars/uAI.pas	Mon Sep 12 21:16:57 2005 +0000
@@ -39,11 +39,6 @@
 implementation
 uses uAIActions, uAIMisc, uMisc, uTeams, uConsts, uAIAmmoTests, uGears, SDLh;
 
-function Go(Gear: PGear; Times: Longword): boolean;
-begin
-Result:= false
-end;
-
 procedure Think;
 var Targets: TTargets;
     Angle, Power: integer;
diff -r b6f4b413dd41 -r a6bed8d31444 hedgewars/uAIActions.pas
--- a/hedgewars/uAIActions.pas	Sun Sep 11 21:02:11 2005 +0000
+++ b/hedgewars/uAIActions.pas	Mon Sep 12 21:16:57 2005 +0000
@@ -86,7 +86,7 @@
 function AddAction(Action, Param, TimeDelta: Longword): PAction;
 begin
 New(Result);
-TryDo(Result <> nil, errmsgDynamicVar, true);
+TryDo(Result <> nil, 'AddAction: Result = nil', true);
 FillChar(Result^, sizeof(TAction), 0);
 Result.Action:= Action;
 Result.Param:= Param;
diff -r b6f4b413dd41 -r a6bed8d31444 hedgewars/uConsole.pas
--- a/hedgewars/uConsole.pas	Sun Sep 11 21:02:11 2005 +0000
+++ b/hedgewars/uConsole.pas	Mon Sep 12 21:16:57 2005 +0000
@@ -67,9 +67,8 @@
 
 function RegisterVariable(Name: string; VType: TVariableType; p: pointer): PVariable;
 begin
-try
-   New(Result);
-except Result:= nil; OutError(errmsgDynamicVar, true) end;
+New(Result);
+TryDo(Result <> nil, 'RegisterVariable: Result = nil', true);
 FillChar(Result^, sizeof(TVariable), 0);
 Result.Name:= Name;
 Result.VType:= VType;
@@ -90,9 +89,7 @@
       begin
       t:= tt;
       tt:= tt.Next;
-      try
       Dispose(t)
-      except OutError(errmsgDynamicVar) end;
       end;
 end;
 
diff -r b6f4b413dd41 -r a6bed8d31444 hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas	Sun Sep 11 21:02:11 2005 +0000
+++ b/hedgewars/uConsts.pas	Mon Sep 12 21:16:57 2005 +0000
@@ -72,7 +72,6 @@
       errmsgCreateSurface   = 'Error creating DirectDraw7 surface';
       errmsgNoDesc          = 'Unknown error';
       errmsgTransparentSet  = 'Error setting transparent color';
-      errmsgDynamicVar      = 'Error working with dynamic memory';
       errmsgUnknownCommand  = 'Unknown command';
       errmsgUnknownVariable = 'Unknown variable';
       errmsgIncorrectUse    = 'Incorrect use';
diff -r b6f4b413dd41 -r a6bed8d31444 hedgewars/uGears.pas
--- a/hedgewars/uGears.pas	Sun Sep 11 21:02:11 2005 +0000
+++ b/hedgewars/uGears.pas	Mon Sep 12 21:16:57 2005 +0000
@@ -62,7 +62,7 @@
              Tag: integer;
              end;
 
-function AddGear(X, Y: integer; Kind: TGearType; State: Cardinal; const dX: real=0.0; dY: real=0.0; Timer: LongWord=0): PGear;
+function  AddGear(X, Y: integer; Kind: TGearType; State: Cardinal; const dX: real=0.0; dY: real=0.0; Timer: LongWord=0): PGear;
 procedure ProcessGears;
 procedure SetAllToActive;
 procedure SetAllHHToActive;
@@ -88,7 +88,7 @@
 
 procedure DeleteGear(Gear: PGear); forward;
 procedure doMakeExplosion(X, Y, Radius: integer; Mask: LongWord); forward;
-function CheckGearNear(Gear: PGear; Kind: TGearType; rX, rY: integer): PGear; forward;
+function  CheckGearNear(Gear: PGear; Kind: TGearType; rX, rY: integer): PGear; forward;
 procedure SpawnBoxOfSmth; forward;
 
 {$INCLUDE GSHandlers.inc}
@@ -478,9 +478,7 @@
       begin
       t:= tt;
       tt:= tt.NextGear;
-      try
       Dispose(t)
-      except OutError(errmsgDynamicVar) end;
       end;
 end;
 
diff -r b6f4b413dd41 -r a6bed8d31444 hedgewars/uIO.pas
--- a/hedgewars/uIO.pas	Sun Sep 11 21:02:11 2005 +0000
+++ b/hedgewars/uIO.pas	Mon Sep 12 21:16:57 2005 +0000
@@ -231,7 +231,7 @@
 {$I+}
 TryDo(IOResult = 0, msgFailed, true);
 WriteLnToConsole(msgOK);
-TryDo(Count < cnt, 'Fort doesn''t contain needed spawn points', true);
+TryDo(Count < cnt, 'Fort doesn''t contain needed amount of spawn points', true);
 for i:= 0 to Pred(cnt) do
     begin
     t:= GetRandom(cnt);
diff -r b6f4b413dd41 -r a6bed8d31444 hedgewars/uMisc.pas
--- a/hedgewars/uMisc.pas	Sun Sep 11 21:02:11 2005 +0000
+++ b/hedgewars/uMisc.pas	Mon Sep 12 21:16:57 2005 +0000
@@ -202,6 +202,7 @@
 initialization
 assignfile(f, 'debug.txt');
 rewrite(f);
+
 finalization
 writeln(f, '-= halt at ',GameTicks,' ticks =-');
 Flush(f);
diff -r b6f4b413dd41 -r a6bed8d31444 hedgewars/uTeams.pas
--- a/hedgewars/uTeams.pas	Sun Sep 11 21:02:11 2005 +0000
+++ b/hedgewars/uTeams.pas	Mon Sep 12 21:16:57 2005 +0000
@@ -140,9 +140,8 @@
 
 function AddTeam: PTeam;
 begin
-try
-   New(Result);
-except Result:= nil; OutError(errmsgDynamicVar, true) end;
+New(Result);
+TryDo(Result <> nil, 'AddTean: Result = nil', true);
 FillChar(Result^, sizeof(TTeam), 0);
 Result.AttackBar:= 1;
 if TeamsList = nil then TeamsList:= Result
@@ -162,9 +161,7 @@
       begin
       t:= tt;
       tt:= tt.Next;
-      try
       Dispose(t)
-      except OutError(errmsgDynamicVar) end;
       end;
 end;