sfs and wad code refactoring: part 1

[d2df-sdl.git] / src / game / g_basic.pas

diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas
index e1ce980bc548a2f5e0e7ed16a7f745daab755fe0..69d8aa7f3029290b3bf6335f3e99c51a605f5569 100644 (file)
--- a/src/game/g_basic.pas
+++ b/src/game/g_basic.pas
@@ -3,7 +3,7 @@ unit g_basic;
 interface
 
 uses
-  WADEDITOR, g_phys;
+  wadreader, g_phys;
 
 const
   GAME_VERSION  = '0.667';
@@ -496,14 +496,14 @@ begin
   a := abs(vx);
   b := abs(vy);
 
-  if a = 0 then 
+  if a = 0 then
     c := 0
-  else 
+  else
     c := RadToDeg(ArcTan(b/a));
 
-  if vy < 0 then 
+  if vy < 0 then
     c := -c;
-  if vx > 0 then 
+  if vx > 0 then
     c := 180 - c;
 
   c := c + 180;
@@ -614,6 +614,7 @@ function GetStr(var Str: string): string;
 var
   a: Integer;
 begin
+  Result := '';
   for a := 1 to Length(Str) do
     if (a = Length(Str)) or (Str[a+1] = ' ') then
     begin
@@ -827,7 +828,7 @@ var
     begin
       while (fmt[m] = ' ') and (m < Length(fmt)) do
         Inc(m);
-      if (m >= Length(fmt)) then 
+      if (m >= Length(fmt)) then
         Break;
 
       if (fmt[m] = '%') then
@@ -852,6 +853,7 @@ begin
   n := 1;
   m := 1;
   Result := 0;
+  s1 := '';
 
   for i := 0 to High(Pointers) do
   begin
@@ -892,7 +894,7 @@ begin
         else
           Break;
       end;
-      
+
       else {case}
         Break;
     end; {case}
@@ -965,7 +967,7 @@ begin
 
       o^ := p.Obj;
     end;
-  
+
     UID_MONSTER:
     begin
       m := g_Monsters_Get(UID);