diff --git a/src/game/g_items.pas b/src/game/g_items.pas
index 253a0311607bbc2f12f27e4ee4c6a85f2b234e99..e531acd4fde93d082eeb882295f45db4053d1b52 100644 (file)
--- a/src/game/g_items.pas
+++ b/src/game/g_items.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* Copyright (C) Doom 2D: Forever Developers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
interface
uses
- g_textures, g_phys, g_saveload, BinEditor, MAPDEF;
+ SysUtils, Classes,
+ MAPDEF, g_textures, g_phys, g_saveload;
Type
PItem = ^TItem;
arrIdx: Integer; // in ggItems
public
- ItemType: Byte;
- Respawnable: Boolean;
- InitX, InitY: Integer;
- RespawnTime: Word;
- Live: Boolean;
- Fall: Boolean;
- QuietRespawn: Boolean;
- SpawnTrigger: Integer;
- Obj: TObj;
- Animation: TAnimation;
+ ItemType: Byte;
+ Respawnable: Boolean;
+ InitX, InitY: Integer;
+ RespawnTime: Word;
+ alive: Boolean;
+ Fall: Boolean;
+ QuietRespawn: Boolean;
+ SpawnTrigger: Integer;
+ 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
procedure positionChanged (); //WARNING! call this after monster position was changed, or coldet will not work right!
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_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(var Mem: TBinMemoryWriter);
-procedure g_Items_LoadState(var Mem: TBinMemoryReader);
+procedure g_Items_SaveState (st: TStream);
+procedure g_Items_LoadState (st: TStream);
procedure g_Items_RestartRound ();
implementation
uses
+ Math,
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,
+ g_game, g_triggers, g_console, g_player, g_net, g_netmsg,
e_log,
- g_grid, binheap, idpool;
+ g_grid, binheap, idpool, utils, xstreams;
var
procedure g_Items_LoadData();
begin
- e_WriteLog('Loading items data...', MSG_NOTIFY);
+ e_WriteLog('Loading items data...', TMsgType.Notify);
g_Sound_CreateWADEx('SOUND_ITEM_RESPAWNITEM', GameWAD+':SOUNDS\RESPAWNITEM');
g_Sound_CreateWADEx('SOUND_ITEM_GETRULEZ', GameWAD+':SOUNDS\GETRULEZ');
procedure g_Items_FreeData();
begin
- e_WriteLog('Releasing items data...', MSG_NOTIFY);
+ e_WriteLog('Releasing items data...', TMsgType.Notify);
g_Sound_Delete('SOUND_ITEM_RESPAWNITEM');
g_Sound_Delete('SOUND_ITEM_GETRULEZ');
it.Animation.Free();
it.Animation := nil;
end;
- it.Live := False;
+ it.alive := False;
it.SpawnTrigger := -1;
it.ItemType := ITEM_NONE;
freeIds.release(LongWord(idx));
it.arrIdx := i;
it.ItemType := ITEM_NONE;
it.Animation := nil;
- it.Live := false;
+ it.alive := false;
it.SpawnTrigger := -1;
it.Respawnable := false;
//if not freeIds.hasFree[LongWord(i)] then raise Exception.Create('internal error in item idx manager');
it.InitY := Y;
it.RespawnTime := 0;
it.Fall := Fall;
- it.Live := True;
+ it.alive := True;
it.QuietRespawn := False;
+ it.dropped := false;
g_Obj_Init(@it.Obj);
it.Obj.X := X;
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;
end;
-procedure g_Items_Draw ();
+procedure itemsDrawInternal (dropflag: Boolean);
var
i: Integer;
+ it: PItem;
begin
if (ggItems = nil) then exit;
for i := 0 to High(ggItems) do
begin
- if not ggItems[i].Live then continue;
+ it := @ggItems[i];
+ if not it.alive then continue;
+ if (it.dropped <> dropflag) then continue;
- with ggItems[i] do
+ with it^ do
begin
- if g_dbg_scale_05 or g_Collide(Obj.X, Obj.Y, Obj.Rect.Width, Obj.Rect.Height, sX, sY, sWidth, sHeight) then
+ if g_Collide(Obj.X, Obj.Y, Obj.Rect.Width, Obj.Rect.Height, sX, sY, sWidth, sHeight) then
begin
if (Animation = nil) then
begin
end
else
begin
- Animation.Draw(Obj.X, Obj.Y, M_NONE);
+ Animation.Draw(Obj.X, Obj.Y, TMirrorType.None);
end;
if g_debug_Frames then
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
+ begin
+ ggItems[ID].dropped := true;
+ end;
+end;
+
+
procedure g_Items_Pick (ID: DWORD);
begin
- ggItems[ID].Live := false;
- ggItems[ID].RespawnTime := ITEM_RESPAWNTIME;
+ if (ID < Length(ggItems)) then
+ begin
+ ggItems[ID].alive := false;
+ ggItems[ID].RespawnTime := ITEM_RESPAWNTIME;
+ end;
end;
end;
-procedure g_Items_SaveState (var Mem: TBinMemoryWriter);
+procedure g_Items_SaveState (st: TStream);
var
count, i: Integer;
- sig: DWORD;
+ tt: Byte;
begin
// Ñ÷èòàåì êîëè÷åñòâî ñóùåñòâóþùèõ ïðåäìåòîâ
count := 0;
- if (ggItems <> nil) then
- begin
- for i := 0 to High(ggItems) do if (ggItems[i].ItemType <> ITEM_NONE) then Inc(count);
- end;
-
- Mem := TBinMemoryWriter.Create((count+1) * 60);
+ for i := 0 to High(ggItems) do if (ggItems[i].ItemType <> ITEM_NONE) then Inc(count);
// Êîëè÷åñòâî ïðåäìåòîâ
- Mem.WriteInt(count);
-
+ utils.writeInt(st, LongInt(count));
if (count = 0) then exit;
for i := 0 to High(ggItems) do
if (ggItems[i].ItemType <> ITEM_NONE) then
begin
// Ñèãíàòóðà ïðåäìåòà
- sig := ITEM_SIGNATURE; // 'ITEM'
- Mem.WriteDWORD(sig);
+ utils.writeSign(st, 'ITEM');
+ utils.writeInt(st, Byte(0));
// Òèï ïðåäìåòà
- Mem.WriteByte(ggItems[i].ItemType);
+ tt := ggItems[i].ItemType;
+ if ggItems[i].dropped then tt := tt or $80;
+ utils.writeInt(st, Byte(tt));
// Åñòü ëè ðåñïàóí
- Mem.WriteBoolean(ggItems[i].Respawnable);
+ utils.writeBool(st, ggItems[i].Respawnable);
// Êîîðäèíàòû ðåñïóíà
- Mem.WriteInt(ggItems[i].InitX);
- Mem.WriteInt(ggItems[i].InitY);
+ utils.writeInt(st, LongInt(ggItems[i].InitX));
+ utils.writeInt(st, LongInt(ggItems[i].InitY));
// Âðåìÿ äî ðåñïàóíà
- Mem.WriteWord(ggItems[i].RespawnTime);
+ utils.writeInt(st, Word(ggItems[i].RespawnTime));
// Ñóùåñòâóåò ëè ýòîò ïðåäìåò
- Mem.WriteBoolean(ggItems[i].Live);
+ utils.writeBool(st, ggItems[i].alive);
// Ìîæåò ëè îí ïàäàòü
- Mem.WriteBoolean(ggItems[i].Fall);
+ utils.writeBool(st, ggItems[i].Fall);
// Èíäåêñ òðèããåðà, ñîçäàâøåãî ïðåäìåò
- Mem.WriteInt(ggItems[i].SpawnTrigger);
+ utils.writeInt(st, LongInt(ggItems[i].SpawnTrigger));
// Îáúåêò ïðåäìåòà
- Obj_SaveState(@ggItems[i].Obj, Mem);
+ Obj_SaveState(st, @ggItems[i].Obj);
end;
end;
end;
-procedure g_Items_LoadState (var Mem: TBinMemoryReader);
+procedure g_Items_LoadState (st: TStream);
var
count, i, a: Integer;
- sig: DWORD;
b: Byte;
begin
- if (Mem = nil) then exit;
+ assert(st <> nil);
g_Items_Free();
// Êîëè÷åñòâî ïðåäìåòîâ
- Mem.ReadInt(count);
-
- if (count = 0) then Exit;
+ count := utils.readLongInt(st);
+ if (count = 0) then exit;
+ if (count < 0) or (count > 1024*1024) then raise XStreamError.Create('invalid number of items');
for a := 0 to count-1 do
begin
// Ñèãíàòóðà ïðåäìåòà
- Mem.ReadDWORD(sig);
- if (sig <> ITEM_SIGNATURE) then raise EBinSizeError.Create('g_Items_LoadState: Wrong Item Signature'); // 'ITEM'
+ if not utils.checkSign(st, 'ITEM') then raise XStreamError.Create('invalid item signature');
+ if (utils.readByte(st) <> 0) then raise XStreamError.Create('invalid item version');
// Òèï ïðåäìåòà
- Mem.ReadByte(b);
+ b := utils.readByte(st); // bit7=1: monster drop
// Ñîçäàåì ïðåäìåò
- i := g_Items_Create(0, 0, b, False, False);
+ i := g_Items_Create(0, 0, b and $7F, False, False);
+ if ((b and $80) <> 0) then g_Items_SetDrop(i);
// Åñòü ëè ðåñïàóí
- Mem.ReadBoolean(ggItems[i].Respawnable);
+ ggItems[i].Respawnable := utils.readBool(st);
// Êîîðäèíàòû ðåñïóíà
- Mem.ReadInt(ggItems[i].InitX);
- Mem.ReadInt(ggItems[i].InitY);
+ ggItems[i].InitX := utils.readLongInt(st);
+ ggItems[i].InitY := utils.readLongInt(st);
// Âðåìÿ äî ðåñïàóíà
- Mem.ReadWord(ggItems[i].RespawnTime);
+ ggItems[i].RespawnTime := utils.readWord(st);
// Ñóùåñòâóåò ëè ýòîò ïðåäìåò
- Mem.ReadBoolean(ggItems[i].Live);
+ ggItems[i].alive := utils.readBool(st);
// Ìîæåò ëè îí ïàäàòü
- Mem.ReadBoolean(ggItems[i].Fall);
+ ggItems[i].Fall := utils.readBool(st);
// Èíäåêñ òðèããåðà, ñîçäàâøåãî ïðåäìåò
- Mem.ReadInt(ggItems[i].SpawnTrigger);
+ ggItems[i].SpawnTrigger := utils.readLongInt(st);
// Îáúåêò ïðåäìåòà
- Obj_LoadState(@ggItems[i].Obj, Mem);
+ Obj_LoadState(@ggItems[i].Obj, st);
end;
end;
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;
for f := 0 to High(ggItems) do
begin
it := @ggItems[f];
- if not it.Live then continue;
+ 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);