X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_items.pas;h=88a9cba1c433057f3ede53d4bf118ad43aecbc9c;hb=dffafd305d0df029f317cc92c1968ba0065c0cd8;hp=8efa5ca9fb4626cd1907e805d640db44e5153033;hpb=987c4a835a103345b59937e8e1be8524a6228712;p=d2df-sdl.git

diff --git a/src/game/g_items.pas b/src/game/g_items.pas
index 8efa5ca..88a9cba 100644
--- a/src/game/g_items.pas
+++ b/src/game/g_items.pas
@@ -54,6 +54,7 @@ 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();
@@ -83,7 +84,6 @@ 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;
 
 implementation
 
@@ -454,7 +454,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;
@@ -464,6 +463,8 @@ begin
   it.dropped := false;
 
   g_Obj_Init(@it.Obj);
+  it.Obj.oldX := X;
+  it.Obj.oldY := Y;
   it.Obj.X := X;
   it.Obj.Y := Y;
   it.Obj.Rect.Width := ITEMSIZE[ItemType][0];
@@ -502,17 +503,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 +593,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 +622,8 @@ begin
             Anim.Free();
           end;
 
+          Obj.oldX := InitX;
+          Obj.oldY := InitY;
           Obj.X := InitX;
           Obj.Y := InitY;
           Obj.Vel.X := 0;
@@ -626,7 +647,7 @@ end;
 
 procedure itemsDrawInternal (dropflag: Boolean);
 var
-  i: Integer;
+  i, fX, fY: Integer;
   it: PItem;
 begin
   if (ggItems = nil) then exit;
@@ -642,13 +663,14 @@ begin
     begin
       if g_Collide(Obj.X, Obj.Y, Obj.Rect.Width, Obj.Rect.Height, sX, sY, sWidth, sHeight) then
       begin
+        Obj.lerp(gLerpFactor, fX, fY);
         if (Animation = nil) then
         begin
-          e_Draw(gItemsTexturesID[ItemType], Obj.X, Obj.Y, 0, true, false);
+          e_Draw(gItemsTexturesID[ItemType], fX, fY, 0, true, false);
         end
         else
         begin
-          Animation.Draw(Obj.X, Obj.Y, TMirrorType.None);
+          Animation.Draw(fX, fY, TMirrorType.None);
         end;
 
         if g_debug_Frames then
@@ -689,8 +711,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 +734,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 +839,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