X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_items.pas;h=23c10df8aadc7d3a1e45197991f8f0317a5bb1a2;hb=541bba4ec498539ae13827e2c821b1eb8bca7db8;hp=9693ad07f31270f0d4e691a33ebcd66de8cbe04d;hpb=0b34f8195a84d9aecc7cd9f17fd1902b7723e3b8;p=d2df-sdl.git diff --git a/src/game/g_items.pas b/src/game/g_items.pas index 9693ad0..23c10df 100644 --- a/src/game/g_items.pas +++ b/src/game/g_items.pas @@ -41,9 +41,13 @@ 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! + procedure getMapBox (out x, y, w, h: Integer); inline; + procedure moveBy (dx, dy: Integer); inline; + property used: Boolean read slotIsUsed; property myid: Integer read arrIdx; end; @@ -54,9 +58,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); @@ -78,27 +81,24 @@ type TItemEachAliveCB = function (it: PItem): Boolean is nested; // return `true` to stop function g_Items_ForEachAlive (cb: TItemEachAliveCB; backwards: Boolean=false): Boolean; - +function g_Items_NextAlive (startIdx: Integer): PItem; 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_main, g_gfx, g_map, g_game, g_triggers, g_console, g_player, g_net, g_netmsg, e_log, g_grid, binheap, idpool, utils, xstreams; - -var - ggItems: Array of TItem = nil; - - // ////////////////////////////////////////////////////////////////////////// // var freeIds: TIdPool = nil; @@ -133,8 +133,26 @@ end; // ////////////////////////////////////////////////////////////////////////// // procedure TItem.positionChanged (); begin + NeedSend := NeedSend or (Obj.X <> Obj.oldX) or (Obj.Y <> Obj.oldY); +end; + +procedure TItem.getMapBox (out x, y, w, h: Integer); inline; +begin + x := Obj.X+Obj.Rect.X; + y := Obj.Y+Obj.Rect.Y; + w := Obj.Rect.Width; + h := Obj.Rect.Height; end; +procedure TItem.moveBy (dx, dy: Integer); inline; +begin + if (dx <> 0) or (dy <> 0) then + begin + Obj.X += dx; + Obj.Y += dy; + positionChanged(); + end; +end; // ////////////////////////////////////////////////////////////////////////// // const @@ -348,6 +366,7 @@ begin it.alive := False; it.SpawnTrigger := -1; it.ItemType := ITEM_NONE; + it.NeedSend := false; freeIds.release(LongWord(idx)); end; @@ -371,6 +390,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; @@ -461,6 +481,7 @@ begin it.alive := True; it.QuietRespawn := False; it.dropped := false; + it.NeedSend := false; g_Obj_Init(@it.Obj); it.Obj.X := X; @@ -483,6 +504,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); @@ -501,17 +525,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; @@ -576,7 +615,7 @@ begin // Íàäî óáðàòü ñ êàðòû, åñëè ýòî íå êëþ÷, êîòîðûì íóæíî ïîäåëèòüñÿ ñ äðóãèì èãðîêîì if r then begin - if not (Respawnable and (ITEM_RESPAWNTIME > 0)) then + if not (Respawnable and (ItemRespawnTime > 0)) then g_Items_Remove(i) else g_Items_Pick(i); @@ -605,6 +644,8 @@ begin Anim.Free(); end; + Obj.oldX := InitX; + Obj.oldY := InitY; Obj.X := InitX; Obj.Y := InitY; Obj.Vel.X := 0; @@ -625,59 +666,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 @@ -691,8 +679,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; @@ -712,6 +702,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); @@ -815,6 +807,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 @@ -861,6 +855,19 @@ begin end; end; +function g_Items_NextAlive (startIdx: Integer): PItem; +var + idx: Integer; +begin + result := nil; + if (ggItems = nil) or (startIdx >= High(ggItems)) then exit; + for idx := startIdx + 1 to High(ggItems) do + if ggItems[idx].alive and ggItems[idx].slotIsUsed then + begin + result := @ggItems[idx]; + exit; + end; +end; // ////////////////////////////////////////////////////////////////////////// // procedure g_Items_EmitPickupSound (idx: Integer);