diff --git a/src/game/g_items.pas b/src/game/g_items.pas
index b0a053d5c1ca83ba8883a318379008c91dbb6444..c7565417c799ce2952c103a6c881e3cc53506d0a 100644 (file)
--- a/src/game/g_items.pas
+++ b/src/game/g_items.pas
//treeNode: Integer;
slotIsUsed: Boolean;
arrIdx: Integer; // in ggItems
- nextFree: Integer; // in item array
public
ItemType: Byte;
Respawnable: Boolean;
InitX, InitY: Integer;
RespawnTime: Word;
- Live: Boolean;
+ alive: Boolean;
Fall: Boolean;
QuietRespawn: Boolean;
SpawnTrigger: Integer;
procedure g_Items_EmitPickupSound (idx: Integer); // at item position
procedure g_Items_EmitPickupSoundAt (idx, x, y: Integer);
+procedure g_Items_AddDynLights();
+
type
TItemEachAliveCB = function (it: PItem): Boolean is nested; // return `true` to stop
g_basic, e_graphics, g_sound, g_main, g_gfx, g_map,
Math, g_game, g_triggers, g_console, SysUtils, g_player, g_net, g_netmsg,
e_log,
- g_grid, binheap;
+ g_grid, binheap, idpool;
var
// ////////////////////////////////////////////////////////////////////////// //
var
- //freeIds: TBinaryHeapInt = nil; // free item ids
- freeListHead: Integer = -1;
+ freeIds: TIdPool = nil;
// ////////////////////////////////////////////////////////////////////////// //
InitTextures();
- //freeIds := binHeapNewIntLess();
+ freeIds := TIdPool.Create();
end;
g_Texture_Delete('ITEM_MEDKIT_BLACK');
g_Texture_Delete('ITEM_JETPACK');
- //freeIds.Free();
+ freeIds.Free();
+ freeIds := nil;
end;
it: PItem;
begin
if (idx < 0) or (idx > High(ggItems)) then raise Exception.Create('releaseItem: invalid item id');
+ if not freeIds.hasAlloced[LongWord(idx)] then raise Exception.Create('releaseItem: trying to release unallocated item (0)');
it := @ggItems[idx];
- if not it.slotIsUsed then raise Exception.Create('releaseItem: trying to release unallocated item');
+ if not it.slotIsUsed then raise Exception.Create('releaseItem: trying to release unallocated item (1)');
if (it.arrIdx <> idx) then raise Exception.Create('releaseItem: arrIdx inconsistency');
it.slotIsUsed := false;
if (it.Animation <> nil) then
it.Animation.Free();
it.Animation := nil;
end;
- it.Live := False;
+ it.alive := False;
it.SpawnTrigger := -1;
it.ItemType := ITEM_NONE;
- //freeIds.insert(it.arrIdx);
- it.nextFree := freeListHead;
- freeListHead := idx;
-end;
-
-
-procedure rebuildFreeList (reservedIdx: Integer=-1);
-var
- i, lfi: Integer;
- it: PItem;
-begin
- // rebuild free list
- freeListHead := -1;
- lfi := -1;
- for i := 0 to High(ggItems) do
- begin
- it := @ggItems[i];
- if (i <> reservedIdx) and (not it.slotIsUsed) then
- begin
- if (lfi = -1) then freeListHead := i else ggItems[lfi].nextFree := lfi;
- lfi := i;
- end;
- end;
- if (lfi <> -1) then ggItems[lfi].nextFree := -1;
+ freeIds.release(LongWord(idx));
end;
-procedure growItemArrayTo (newsz: Integer; rebuildList: Boolean=true);
+procedure growItemArrayTo (newsz: Integer);
var
i, olen: Integer;
it: PItem;
it := @ggItems[i];
it.slotIsUsed := false;
it.arrIdx := i;
- it.nextFree := i+1;
it.ItemType := ITEM_NONE;
it.Animation := nil;
- it.Live := false;
+ it.alive := false;
it.SpawnTrigger := -1;
it.Respawnable := false;
- //freeIds.insert(i);
+ //if not freeIds.hasFree[LongWord(i)] then raise Exception.Create('internal error in item idx manager');
end;
- if rebuildList then rebuildFreeList();
end;
function allocItem (): DWORD;
begin
- if (freeListHead = -1) then
- begin
- growItemArrayTo(Length(ggItems)+64);
- if (freeListHead = -1) then raise Exception.Create('internal error in item manager');
- end;
-
- result := DWORD(freeListHead);
- freeListHead := ggItems[freeListHead].nextFree;
-
+ result := freeIds.alloc();
+ if (result >= Length(ggItems)) then growItemArrayTo(Integer(result)+64);
if (Integer(result) > High(ggItems)) then raise Exception.Create('allocItem: freeid list corrupted');
if (ggItems[result].arrIdx <> Integer(result)) then raise Exception.Create('allocItem: arrIdx inconsistency');
end;
var
olen: Integer;
it: PItem;
- rebuildList: Boolean = false;
begin
if (slot < 0) or (slot > $0fffffff) then raise Exception.Create('wantItemSlot: bad item slot request');
// do we need to grow item storate?
olen := Length(ggItems);
- if (slot >= olen) then
- begin
- growItemArrayTo(slot+64, false);
- rebuildList := true;
- end;
+ if (slot >= olen) then growItemArrayTo(slot+64);
it := @ggItems[slot];
- if rebuildList or (not it.slotIsUsed) then
+ if not it.slotIsUsed then
+ begin
+ freeIds.alloc(LongWord(slot));
+ end
+ else
begin
- rebuildFreeList(slot);
+ if not freeIds.hasAlloced[slot] then raise Exception.Create('wantItemSlot: internal error in item idx manager');
end;
it.slotIsUsed := false;
for i := 0 to High(ggItems) do ggItems[i].Animation.Free();
ggItems := nil;
end;
- //freeIds.clear();
- freeListHead := -1;
+ freeIds.clear();
end;
it.InitY := Y;
it.RespawnTime := 0;
it.Fall := Fall;
- it.Live := True;
+ it.alive := True;
it.QuietRespawn := False;
g_Obj_Init(@it.Obj);
begin
nxt := False;
- if Live then
+ if alive then
begin
if Fall then
begin
Inc(j);
if j > High(gPlayers) then j := 0;
- if (gPlayers[j] <> nil) and gPlayers[j].Live and g_Obj_Collide(@gPlayers[j].Obj, @Obj) then
+ if (gPlayers[j] <> nil) and gPlayers[j].alive and g_Obj_Collide(@gPlayers[j].Obj, @Obj) then
begin
if g_Game_IsClient then continue;
if Respawnable and g_Game_IsServer then
begin
DecMin(RespawnTime, 0);
- if (RespawnTime = 0) and (not Live) then
+ if (RespawnTime = 0) and (not alive) then
begin
if not QuietRespawn then g_Sound_PlayExAt('SOUND_ITEM_RESPAWNITEM', InitX, InitY);
Obj.Accel.Y := 0;
positionChanged(); // this updates spatial accelerators
- Live := true;
+ alive := true;
if g_Game_IsNet then MH_SEND_ItemSpawn(QuietRespawn, i);
QuietRespawn := false;
for i := 0 to High(ggItems) do
begin
- if not ggItems[i].Live then continue;
+ if not ggItems[i].alive then continue;
with ggItems[i] do
begin
- if g_Collide(Obj.X, Obj.Y, Obj.Rect.Width, Obj.Rect.Height, sX, sY, sWidth, sHeight) then
+ if (g_dbg_scale <> 1.0) or g_Collide(Obj.X, Obj.Y, Obj.Rect.Width, Obj.Rect.Height, sX, sY, sWidth, sHeight) then
begin
if (Animation = nil) then
begin
procedure g_Items_Pick (ID: DWORD);
begin
- ggItems[ID].Live := false;
+ ggItems[ID].alive := false;
ggItems[ID].RespawnTime := ITEM_RESPAWNTIME;
end;
// Âðåìÿ äî ðåñïàóíà
Mem.WriteWord(ggItems[i].RespawnTime);
// Ñóùåñòâóåò ëè ýòîò ïðåäìåò
- Mem.WriteBoolean(ggItems[i].Live);
+ Mem.WriteBoolean(ggItems[i].alive);
// Ìîæåò ëè îí ïàäàòü
Mem.WriteBoolean(ggItems[i].Fall);
// Èíäåêñ òðèããåðà, ñîçäàâøåãî ïðåäìåò
// Âðåìÿ äî ðåñïàóíà
Mem.ReadWord(ggItems[i].RespawnTime);
// Ñóùåñòâóåò ëè ýòîò ïðåäìåò
- Mem.ReadBoolean(ggItems[i].Live);
+ Mem.ReadBoolean(ggItems[i].alive);
// Ìîæåò ëè îí ïàäàòü
Mem.ReadBoolean(ggItems[i].Fall);
// Èíäåêñ òðèããåðà, ñîçäàâøåãî ïðåäìåò
begin
for idx := High(ggItems) downto 0 do
begin
- if ggItems[idx].Live then
+ if ggItems[idx].alive then
begin
result := cb(@ggItems[idx]);
if result then exit;
begin
for idx := 0 to High(ggItems) do
begin
- if ggItems[idx].Live then
+ if ggItems[idx].alive then
begin
result := cb(@ggItems[idx]);
if result then exit;
end;
end;
+
+procedure g_Items_AddDynLights();
+var
+ f: Integer;
+ it: PItem;
+begin
+ for f := 0 to High(ggItems) do
+ begin
+ it := @ggItems[f];
+ if not it.alive then continue;
+ case it.ItemType of
+ ITEM_KEY_RED: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 24, 1.0, 0.0, 0.0, 0.6);
+ ITEM_KEY_GREEN: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 24, 0.0, 1.0, 0.0, 0.6);
+ ITEM_KEY_BLUE: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 24, 0.0, 0.0, 1.0, 0.6);
+ ITEM_ARMOR_GREEN: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 42, 0.0, 1.0, 0.0, 0.6);
+ ITEM_ARMOR_BLUE: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 42, 0.0, 0.0, 1.0, 0.6);
+ ITEM_SPHERE_BLUE: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 32, 0.0, 1.0, 0.0, 0.6);
+ ITEM_SPHERE_WHITE: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 32, 1.0, 1.0, 1.0, 0.6);
+ ITEM_INVUL: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 32, 1.0, 0.0, 0.0, 0.6);
+ ITEM_INVIS: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 32, 1.0, 1.0, 0.0, 0.6);
+ ITEM_BOTTLE: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 16, 0.0, 0.0, 0.8, 0.6);
+ ITEM_HELMET: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 16, 0.0, 0.8, 0.0, 0.6);
+ end;
+ end;
+end;
+
+
end.