X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_items.pas;h=0aa9d560ab9b00cd002fbca4ac994b9f80a76ede;hb=d55f78661cd9bd77609beed2552d7dd6262ad65c;hp=200ebdd96cf725a2bc486d043e66bfce96ce46e4;hpb=be2ad7bf5e09b4ee91a0c5ee741503ace8c7887c;p=d2df-sdl.git

diff --git a/src/game/g_items.pas b/src/game/g_items.pas
index 200ebdd..0aa9d56 100644
--- a/src/game/g_items.pas
+++ b/src/game/g_items.pas
@@ -41,6 +41,7 @@ Type
     Obj: TObj;
     Animation: TAnimation;
     dropped: Boolean; // dropped from the monster? drops should be rendered after corpses, so zombie corpse will not obscure ammo container, for example
+    NeedSend: Boolean;
 
     procedure positionChanged (); //WARNING! call this after monster position was changed, or coldet will not work right!
 
@@ -54,6 +55,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();
@@ -132,6 +134,7 @@ end;
 // ////////////////////////////////////////////////////////////////////////// //
 procedure TItem.positionChanged ();
 begin
+  NeedSend := NeedSend or (Obj.X <> Obj.oldX) or (Obj.Y <> Obj.oldY);
 end;
 
 
@@ -347,6 +350,7 @@ begin
   it.alive := False;
   it.SpawnTrigger := -1;
   it.ItemType := ITEM_NONE;
+  it.NeedSend := false;
   freeIds.release(LongWord(idx));
 end;
 
@@ -370,6 +374,7 @@ begin
     it.alive := false;
     it.SpawnTrigger := -1;
     it.Respawnable := false;
+    it.NeedSend := false;
     //if not freeIds.hasFree[LongWord(i)] then raise Exception.Create('internal error in item idx manager');
   end;
 end;
@@ -460,6 +465,7 @@ begin
   it.alive := True;
   it.QuietRespawn := False;
   it.dropped := false;
+  it.NeedSend := false;
 
   g_Obj_Init(@it.Obj);
   it.Obj.X := X;
@@ -482,6 +488,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);
@@ -500,17 +509,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;
@@ -575,7 +599,7 @@ begin
               // Íàäî óáðàòü ñ êàðòû, åñëè ýòî íå êëþ÷, êîòîðûì íóæíî ïîäåëèòüñÿ ñ äðóãèì èãðîêîì
               if r then
               begin
-                if not (Respawnable and (gGameSettings.ItemRespawnTime > 0)) then
+                if not (Respawnable and (ItemRespawnTime > 0)) then
                   g_Items_Remove(i)
                 else 
                   g_Items_Pick(i);
@@ -604,6 +628,8 @@ begin
             Anim.Free();
           end;
 
+          Obj.oldX := InitX;
+          Obj.oldY := InitY;
           Obj.X := InitX;
           Obj.Y := InitY;
           Obj.Vel.X := 0;
@@ -627,7 +653,7 @@ end;
 
 procedure itemsDrawInternal (dropflag: Boolean);
 var
-  i: Integer;
+  i, fX, fY: Integer;
   it: PItem;
 begin
   if (ggItems = nil) then exit;
@@ -643,13 +669,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
@@ -690,8 +717,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 := gGameSettings.ItemRespawnTime * 36;
+    ggItems[ID].RespawnTime := IfThen(gLMSRespawn = LMS_RESPAWN_NONE, gGameSettings.ItemRespawnTime, 15) * 36;
   end;
 end;
 
@@ -711,6 +740,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);
@@ -814,6 +845,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