diff --git a/src/game/g_items.pas b/src/game/g_items.pas
index c7565417c799ce2952c103a6c881e3cc53506d0a..ae047f82b8afcc86bfa283e05012af0964c9b3a5 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
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;
- alive: 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
g_Texture_Get('ITEM_KEY_BLUE', gItemsTexturesID[ITEM_KEY_BLUE]);
g_Texture_Get('ITEM_WEAPON_KASTET', gItemsTexturesID[ITEM_WEAPON_KASTET]);
g_Texture_Get('ITEM_WEAPON_PISTOL', gItemsTexturesID[ITEM_WEAPON_PISTOL]);
- g_Texture_Get('ITEM_JETPACK', gItemsTexturesID[ITEM_JETPACK]);
end;
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');
g_Frames_CreateWAD(nil, 'FRAMES_ITEM_WHITESPHERE', GameWAD+':TEXTURES\SWHITE', 32, 32, 4, True);
g_Frames_CreateWAD(nil, 'FRAMES_ITEM_ARMORGREEN', GameWAD+':TEXTURES\ARMORGREEN', 32, 16, 3, True);
g_Frames_CreateWAD(nil, 'FRAMES_ITEM_ARMORBLUE', GameWAD+':TEXTURES\ARMORBLUE', 32, 16, 3, True);
+ g_Frames_CreateWAD(nil, 'FRAMES_ITEM_JETPACK', GameWAD+':TEXTURES\JETPACK', 32, 32, 3, True);
g_Frames_CreateWAD(nil, 'FRAMES_ITEM_INVUL', GameWAD+':TEXTURES\INVUL', 32, 32, 4, True);
g_Frames_CreateWAD(nil, 'FRAMES_ITEM_INVIS', GameWAD+':TEXTURES\INVIS', 32, 32, 4, True);
g_Frames_CreateWAD(nil, 'FRAMES_ITEM_RESPAWN', GameWAD+':TEXTURES\ITEMRESPAWN', 32, 32, 5, True);
g_Texture_CreateWADEx('ITEM_SUIT', GameWAD+':TEXTURES\SUIT');
g_Texture_CreateWADEx('ITEM_WEAPON_KASTET', GameWAD+':TEXTURES\KASTET');
g_Texture_CreateWADEx('ITEM_MEDKIT_BLACK', GameWAD+':TEXTURES\BMED');
- g_Texture_CreateWADEx('ITEM_JETPACK', GameWAD+':TEXTURES\JETPACK');
InitTextures();
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');
g_Frames_DeleteByName('FRAMES_ITEM_WHITESPHERE');
g_Frames_DeleteByName('FRAMES_ITEM_ARMORGREEN');
g_Frames_DeleteByName('FRAMES_ITEM_ARMORBLUE');
+ g_Frames_DeleteByName('FRAMES_ITEM_JETPACK');
g_Frames_DeleteByName('FRAMES_ITEM_INVUL');
g_Frames_DeleteByName('FRAMES_ITEM_INVIS');
g_Frames_DeleteByName('FRAMES_ITEM_RESPAWN');
g_Texture_Delete('ITEM_SUIT');
g_Texture_Delete('ITEM_WEAPON_KASTET');
g_Texture_Delete('ITEM_MEDKIT_BLACK');
- g_Texture_Delete('ITEM_JETPACK');
freeIds.Free();
freeIds := nil;
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;
it.Fall := Fall;
it.alive := True;
it.QuietRespawn := False;
+ it.dropped := false;
g_Obj_Init(@it.Obj);
it.Obj.X := X;
case it.ItemType of
ITEM_ARMOR_GREEN: if g_Frames_Get(ID, 'FRAMES_ITEM_ARMORGREEN') then it.Animation := TAnimation.Create(ID, True, 20);
ITEM_ARMOR_BLUE: if g_Frames_Get(ID, 'FRAMES_ITEM_ARMORBLUE') then it.Animation := TAnimation.Create(ID, True, 20);
+ ITEM_JETPACK: if g_Frames_Get(ID, 'FRAMES_ITEM_JETPACK') then it.Animation := TAnimation.Create(ID, True, 15);
ITEM_SPHERE_BLUE: if g_Frames_Get(ID, 'FRAMES_ITEM_BLUESPHERE') then it.Animation := TAnimation.Create(ID, True, 15);
ITEM_SPHERE_WHITE: if g_Frames_Get(ID, 'FRAMES_ITEM_WHITESPHERE') then it.Animation := TAnimation.Create(ID, True, 20);
ITEM_INVUL: if g_Frames_Get(ID, 'FRAMES_ITEM_INVUL') then it.Animation := TAnimation.Create(ID, True, 20);
Anim: TAnimation;
m: Word;
r, nxt: Boolean;
+ actualRespawnable: Boolean;
begin
if (ggItems = nil) then exit;
for i := 0 to High(ggItems) do
begin
if (ggItems[i].ItemType = ITEM_NONE) then continue;
+ if not ggItems[i].slotIsUsed then continue; // just in case
with ggItems[i] do
begin
// Íàäî óáðàòü ñ êàðòû, åñëè ýòî íå êëþ÷, êîòîðûì íóæíî ïîäåëèòüñÿ ñ äðóãèì èãðîêîì
if r then
begin
- if not Respawnable then g_Items_Remove(i) else g_Items_Pick(i);
+ actualRespawnable := Respawnable
+ and ((ITEM_RESPAWNTIME > 0) and LongBool(gGameSettings.Options and GAME_OPTION_RESPAWNITEMS));
+ if not actualRespawnable then g_Items_Remove(i) else g_Items_Pick(i);
if g_Game_IsNet then MH_SEND_ItemDestroy(False, i);
nxt := True;
break;
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].alive then continue;
+ 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 ggItems[i] do
+ with it^ do
begin
- if (g_dbg_scale <> 1.0) 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].alive := false;
- ggItems[ID].RespawnTime := ITEM_RESPAWNTIME;
+ if (ID < Length(ggItems)) then
+ begin
+ ggItems[ID].alive := false;
+ ggItems[ID].RespawnTime := ITEM_RESPAWNTIME;
+ end;
end;
it: PItem;
trig: Integer;
begin
- if not g_Items_ValidId(ID) then raise Exception.Create('g_Items_Remove: invalid item id');
+ if not g_Items_ValidId(ID) then
+ begin
+ //writeln('g_Items_Remove: invalid item id: ', ID);
+ raise Exception.Create('g_Items_Remove: invalid item id');
+ //exit;
+ end;
it := @ggItems[ID];
if (it.arrIdx <> Integer(ID)) then raise Exception.Create('g_Items_Remove: arrIdx desync');
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) and (ggItems[i].slotIsUsed) then Inc(count);
// Êîëè÷åñòâî ïðåäìåòîâ
- Mem.WriteInt(count);
-
+ utils.writeInt(st, LongInt(count));
if (count = 0) then exit;
for i := 0 to High(ggItems) do
begin
- if (ggItems[i].ItemType <> ITEM_NONE) then
+ if (ggItems[i].ItemType <> ITEM_NONE) and (ggItems[i].slotIsUsed) 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].alive);
+ 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].alive);
+ 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;
for i := 0 to High(ggItems) do
begin
it := @ggItems[i];
- if it.Respawnable then
+ if not it.slotIsUsed then continue;
+ if it.Respawnable and (it.ItemType <> ITEM_NONE) then
begin
it.QuietRespawn := True;
it.RespawnTime := 0;
begin
for idx := High(ggItems) downto 0 do
begin
- if ggItems[idx].alive then
+ if ggItems[idx].alive and ggItems[idx].slotIsUsed then
begin
result := cb(@ggItems[idx]);
if result then exit;
begin
for idx := 0 to High(ggItems) do
begin
- if ggItems[idx].alive then
+ if ggItems[idx].alive and ggItems[idx].slotIsUsed then
begin
result := cb(@ggItems[idx]);
if result then exit;
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_JETPACK: 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_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);