X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_items.pas;h=8f369bb61926fe6247ee2c9c1923c334042110d2;hb=bd40762ed00ea73717966bb0e5a44ae73a179be0;hp=e81bdd4caa55ddb98fa3c877a8dacd0b4adfda5d;hpb=06becc2e3715be961a5ce32accc4e97a4df28804;p=d2df-sdl.git

diff --git a/src/game/g_items.pas b/src/game/g_items.pas
index e81bdd4..8f369bb 100644
--- a/src/game/g_items.pas
+++ b/src/game/g_items.pas
@@ -21,6 +21,9 @@ uses
   SysUtils, Classes,
   MAPDEF, g_phys, g_saveload;
 
+const
+  ITEM_LAST = ITEM_MAX;
+
 Type
   PItem = ^TItem;
   TItem = record
@@ -82,9 +85,6 @@ type
 function g_Items_ForEachAlive (cb: TItemEachAliveCB; backwards: Boolean=false): Boolean;
 function g_Items_NextAlive (startIdx: Integer): PItem;
 
-var
-  gMaxDist: Integer = 1; // for sounds
-
   var (* private state *)
     ggItems: Array of TItem = nil;
 
@@ -97,7 +97,7 @@ implementation
     Math,
     g_basic, g_sound, g_map,
     g_game, g_triggers, g_console, g_player, g_net, g_netmsg,
-    e_log, g_options,
+    e_log, g_options, g_language, g_window,
     g_grid, binheap, idpool, utils, xstreams
   ;
 
@@ -203,6 +203,7 @@ const
 procedure g_Items_LoadData();
 begin
   e_WriteLog('Loading items data...', TMsgType.Notify);
+  g_Game_SetLoadingText(_lc[I_LOAD_ITEMS_DATA], 0, False);
 
   g_Sound_CreateWADEx('SOUND_ITEM_RESPAWNITEM', GameWAD+':SOUNDS\RESPAWNITEM');
   g_Sound_CreateWADEx('SOUND_ITEM_GETRULEZ', GameWAD+':SOUNDS\GETRULEZ');
@@ -306,12 +307,7 @@ end;
 
 // ////////////////////////////////////////////////////////////////////////// //
 procedure g_Items_Init ();
-var
-  a, b: Integer;
 begin
-  if gMapInfo.Height > gPlayerScreenSize.Y then a := gMapInfo.Height-gPlayerScreenSize.Y else a := gMapInfo.Height;
-  if gMapInfo.Width > gPlayerScreenSize.X then b := gMapInfo.Width-gPlayerScreenSize.X else b := gMapInfo.Width;
-  gMaxDist := Trunc(Hypot(a, b));
 end;