cleanup: remove g_main.pas

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

diff --git a/src/game/g_items.pas b/src/game/g_items.pas
index 8efa5ca9fb4626cd1907e805d640db44e5153033..6c8041ddd97bfe0ba46c4e2081f5dd1ffd8ab866 100644 (file)
--- a/src/game/g_items.pas
+++ b/src/game/g_items.pas
@@ -44,6 +44,7 @@ Type
 
     procedure positionChanged (); //WARNING! call this after monster position was changed, or coldet will not work right!
 
+    property used: Boolean read slotIsUsed;
     property myid: Integer read arrIdx;
   end;
 
@@ -54,9 +55,8 @@ procedure g_Items_Free();
 function g_Items_Create(X, Y: Integer; ItemType: Byte;
            Fall, Respawnable: Boolean; AdjCoord: Boolean = False; ForcedID: Integer = -1): DWORD;
 procedure g_Items_SetDrop (ID: DWORD);
+procedure g_Items_PreUpdate();
 procedure g_Items_Update();
-procedure g_Items_Draw();
-procedure g_Items_DrawDrop();
 procedure g_Items_Pick(ID: DWORD);
 procedure g_Items_Remove(ID: DWORD);
 procedure g_Items_SaveState (st: TStream);
@@ -83,22 +83,19 @@ function g_Items_ForEachAlive (cb: TItemEachAliveCB; backwards: Boolean=false):
 var
   gItemsTexturesID: Array [1..ITEM_MAX] of DWORD;
   gMaxDist: Integer = 1; // for sounds
-  ITEM_RESPAWNTIME: Integer = 60 * 36;
+
+  var (* private state *)
+    ggItems: Array of TItem = nil;
 
 implementation
 
 uses
   Math,
-  g_basic, e_graphics, g_sound, g_main, g_gfx, g_map,
+  g_basic, g_sound, g_gfx, g_map,
   g_game, g_triggers, g_console, g_player, g_net, g_netmsg,
-  e_log,
+  e_log, g_options,
   g_grid, binheap, idpool, utils, xstreams;
 
-
-var
-  ggItems: Array of TItem = nil;
-
-
 // ////////////////////////////////////////////////////////////////////////// //
 var
   freeIds: TIdPool = nil;
@@ -454,7 +451,6 @@ begin
 
   it.ItemType := ItemType;
   it.Respawnable := Respawnable;
-  if g_Game_IsServer and (ITEM_RESPAWNTIME = 0) then it.Respawnable := False;
   it.InitX := X;
   it.InitY := Y;
   it.RespawnTime := 0;
@@ -484,6 +480,9 @@ begin
     end;
   end;
 
+  it.Obj.oldX := it.Obj.X;
+  it.Obj.oldY := it.Obj.Y;
+
   // Óñòàíîâêà àíèìàöèè
   case it.ItemType of
     ITEM_ARMOR_GREEN: if g_Frames_Get(ID, 'FRAMES_ITEM_ARMORGREEN') then it.Animation := TAnimation.Create(ID, True, 20);
@@ -502,17 +501,32 @@ begin
   result := find_id;
 end;
 
+procedure g_Items_PreUpdate ();
+var
+  i: Integer;
+begin
+  if (ggItems = nil) then Exit;
+  for i := 0 to High(ggItems) do
+    if (ggItems[i].ItemType <> ITEM_NONE) and ggItems[i].slotIsUsed then
+    begin
+      ggItems[i].Obj.oldX := ggItems[i].Obj.X;
+      ggItems[i].Obj.oldY := ggItems[i].Obj.Y;
+    end;
+end;
 
 procedure g_Items_Update ();
 var
   i, j, k: Integer;
   ID: DWord;
   Anim: TAnimation;
-  m: Word;
+  m, ItemRespawnTime: Word;
   r, nxt: Boolean;
 begin
   if (ggItems = nil) then exit;
 
+  // respawn items in 15 seconds regardless of settings during warmup
+  ItemRespawnTime := IfThen(gLMSRespawn = LMS_RESPAWN_NONE, gGameSettings.ItemRespawnTime, 15);
+
   for i := 0 to High(ggItems) do
   begin
     if (ggItems[i].ItemType = ITEM_NONE) then continue;
@@ -577,7 +591,10 @@ begin
               // Íàäî óáðàòü ñ êàðòû, åñëè ýòî íå êëþ÷, êîòîðûì íóæíî ïîäåëèòüñÿ ñ äðóãèì èãðîêîì
               if r then
               begin
-                if not Respawnable then g_Items_Remove(i) else g_Items_Pick(i);
+                if not (Respawnable and (ItemRespawnTime > 0)) then
+                  g_Items_Remove(i)
+                else 
+                  g_Items_Pick(i);
                 if g_Game_IsNet then MH_SEND_ItemDestroy(False, i);
                 nxt := True;
                 break;
@@ -603,6 +620,8 @@ begin
             Anim.Free();
           end;
 
+          Obj.oldX := InitX;
+          Obj.oldY := InitY;
           Obj.X := InitX;
           Obj.Y := InitY;
           Obj.Vel.X := 0;
@@ -623,59 +642,6 @@ begin
   end;
 end;
 
-
-procedure itemsDrawInternal (dropflag: Boolean);
-var
-  i: Integer;
-  it: PItem;
-begin
-  if (ggItems = nil) then exit;
-
-  for i := 0 to High(ggItems) do
-  begin
-    it := @ggItems[i];
-    if (not it.slotIsUsed) or (it.ItemType = ITEM_NONE) then continue; // just in case
-    if not it.alive then continue;
-    if (it.dropped <> dropflag) then continue;
-
-    with it^ do
-    begin
-      if g_Collide(Obj.X, Obj.Y, Obj.Rect.Width, Obj.Rect.Height, sX, sY, sWidth, sHeight) then
-      begin
-        if (Animation = nil) then
-        begin
-          e_Draw(gItemsTexturesID[ItemType], Obj.X, Obj.Y, 0, true, false);
-        end
-        else
-        begin
-          Animation.Draw(Obj.X, Obj.Y, TMirrorType.None);
-        end;
-
-        if g_debug_Frames then
-        begin
-          e_DrawQuad(Obj.X+Obj.Rect.X,
-                     Obj.Y+Obj.Rect.Y,
-                     Obj.X+Obj.Rect.X+Obj.Rect.Width-1,
-                     Obj.Y+Obj.Rect.Y+Obj.Rect.Height-1,
-                     0, 255, 0);
-        end;
-      end;
-    end;
-  end;
-end;
-
-
-procedure g_Items_Draw ();
-begin
-  itemsDrawInternal(false);
-end;
-
-procedure g_Items_DrawDrop ();
-begin
-  itemsDrawInternal(true);
-end;
-
-
 procedure g_Items_SetDrop (ID: DWORD);
 begin
   if (ID < Length(ggItems)) then
@@ -689,8 +655,10 @@ procedure g_Items_Pick (ID: DWORD);
 begin
   if (ID < Length(ggItems)) then
   begin
+    ggItems[ID].Obj.oldX := ggItems[ID].Obj.X;
+    ggItems[ID].Obj.oldY := ggItems[ID].Obj.Y;
     ggItems[ID].alive := false;
-    ggItems[ID].RespawnTime := ITEM_RESPAWNTIME;
+    ggItems[ID].RespawnTime := IfThen(gLMSRespawn = LMS_RESPAWN_NONE, gGameSettings.ItemRespawnTime, 15) * 36;
   end;
 end;
 
@@ -710,6 +678,8 @@ begin
   it := @ggItems[ID];
   if (it.arrIdx <> Integer(ID)) then raise Exception.Create('g_Items_Remove: arrIdx desync');
 
+  it.Obj.oldX := it.Obj.X;
+  it.Obj.oldY := it.Obj.Y;
   trig := it.SpawnTrigger;
 
   releaseItem(ID);
@@ -813,6 +783,8 @@ begin
   for i := 0 to High(ggItems) do
   begin
     it := @ggItems[i];
+    it.Obj.oldX := it.Obj.X;
+    it.Obj.oldY := it.Obj.Y;
     if not it.slotIsUsed then continue;
     if it.Respawnable and (it.ItemType <> ITEM_NONE) then
     begin