index 2aa9cfa7fb9b6a17c1cfe81ab4a50f47dcfed398..4aca319356ce70040c524a93dbd1681de2c85c57 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
interface
uses
- Variants,
+ SysUtils, Variants, Classes,
MAPDEF, e_graphics, g_basic, g_sound,
- BinEditor, xdynrec, hashtable, exoma;
+ xdynrec, hashtable, exoma;
type
THashStrVariant = specialize THashBase<AnsiString, Variant>;
ActivateType: Byte;
Keys: Byte;
TexturePanelGUID: Integer;
- TexturePanelType: Word;
+ //TexturePanelType: Word;
TimeOut: Word;
ActivateUID: Word;
AutoSpawn: Boolean;
SpawnCooldown: Integer;
SpawnedCount: Integer;
- ShotPanelType: Word;
+ //ShotPanelType: Word;
ShotPanelTime: Integer;
ShotSightTime: Integer;
ShotSightTimeout: Integer;
procedure g_Triggers_OpenAll();
procedure g_Triggers_DecreaseSpawner(ID: DWORD);
procedure g_Triggers_Free();
-procedure g_Triggers_SaveState(var Mem: TBinMemoryWriter);
-procedure g_Triggers_LoadState(var Mem: TBinMemoryReader);
+procedure g_Triggers_SaveState (st: TStream);
+procedure g_Triggers_LoadState (st: TStream);
var
Math,
g_player, g_map, g_panel, g_gfx, g_game, g_textures,
g_console, g_monsters, g_items, g_phys, g_weapons,
- wadreader, g_main, SysUtils, e_log, g_language,
- g_options, g_net, g_netmsg, utils, xparser;
+ wadreader, g_main, e_log, g_language,
+ g_options, g_net, g_netmsg, utils, xparser, xstreams;
const
TRIGGER_SIGNATURE = $58475254; // 'TRGX'
begin
if (trigPanelGUID <> -1) and (ShotPanelTime = 0) then
begin
- g_Map_SwitchTextureGUID(ShotPanelType, trigPanelGUID);
+ g_Map_SwitchTextureGUID({ShotPanelType,} trigPanelGUID);
ShotPanelTime := 4; // òèêîâ íà âñïûøêó âûñòðåëà
end;
if Result {and (Trigger.TexturePanel <> -1)} then
begin
- g_Map_SwitchTextureGUID(Trigger.TexturePanelType, Trigger.TexturePanelGUID, IfThen(animonce, 2, 1));
+ g_Map_SwitchTextureGUID({Trigger.TexturePanelType,} Trigger.TexturePanelGUID, IfThen(animonce, 2, 1));
end;
end;
if ShotPanelTime > 0 then
begin
Dec(ShotPanelTime);
- if ShotPanelTime = 0 then g_Map_SwitchTextureGUID(ShotPanelType, trigPanelGUID);
+ if ShotPanelTime = 0 then g_Map_SwitchTextureGUID({ShotPanelType,} trigPanelGUID);
end;
if ShotSightTime > 0 then
begin
end;
-procedure g_Triggers_SaveState(var Mem: TBinMemoryWriter);
+procedure g_Triggers_SaveState (st: TStream);
var
count, actCount, i, j: Integer;
- dw: DWORD;
sg: Single;
b: Boolean;
kv: THashStrVariant.PEntry;
- //it: THashStrVariant.TKeyValEnumerator;
- //uname: AnsiString;
t: LongInt;
begin
// Ñ÷èòàåì êîëè÷åñòâî ñóùåñòâóþùèõ òðèããåðîâ
count := Length(gTriggers);
- Mem := TBinMemoryWriter.Create((count+1)*200);
// Êîëè÷åñòâî òðèããåðîâ
- Mem.WriteInt(count);
+ utils.writeInt(st, LongInt(count));
if (count = 0) then exit;
for i := 0 to High(gTriggers) do
begin
// Ñèãíàòóðà òðèããåðà
- dw := TRIGGER_SIGNATURE; // 'TRGX'
- Mem.WriteDWORD(dw);
+ utils.writeSign(st, 'TRGX');
+ utils.writeInt(st, Byte(0));
// Òèï òðèããåðà
- Mem.WriteByte(gTriggers[i].TriggerType);
+ utils.writeInt(st, Byte(gTriggers[i].TriggerType));
if (gTriggers[i].TriggerType = TRIGGER_NONE) then continue; // empty one
// Ñïåöèàëüíûå äàííûå òðèããåðà: ïîòîì èç êàðòû îïÿòü âûòàùèì; ñîõðàíèì òîëüêî èíäåêñ
- Mem.WriteInt(gTriggers[i].mapIndex);
+ utils.writeInt(st, LongInt(gTriggers[i].mapIndex));
// Êîîðäèíàòû ëåâîãî âåðõíåãî óãëà
- Mem.WriteInt(gTriggers[i].X);
- Mem.WriteInt(gTriggers[i].Y);
+ utils.writeInt(st, LongInt(gTriggers[i].X));
+ utils.writeInt(st, LongInt(gTriggers[i].Y));
// Ðàçìåðû
- Mem.WriteWord(gTriggers[i].Width);
- Mem.WriteWord(gTriggers[i].Height);
+ utils.writeInt(st, Word(gTriggers[i].Width));
+ utils.writeInt(st, Word(gTriggers[i].Height));
// Âêëþ÷åí ëè òðèããåð
- Mem.WriteBoolean(gTriggers[i].Enabled);
+ utils.writeBool(st, gTriggers[i].Enabled);
// Òèï àêòèâàöèè òðèããåðà
- Mem.WriteByte(gTriggers[i].ActivateType);
+ utils.writeInt(st, Byte(gTriggers[i].ActivateType));
// Êëþ÷è, íåîáõîäèìûå äëÿ àêòèâàöèè
- Mem.WriteByte(gTriggers[i].Keys);
+ utils.writeInt(st, Byte(gTriggers[i].Keys));
// ID ïàíåëè, òåêñòóðà êîòîðîé èçìåíèòñÿ
- Mem.WriteInt(gTriggers[i].TexturePanelGUID);
+ utils.writeInt(st, LongInt(gTriggers[i].TexturePanelGUID));
// Òèï ýòîé ïàíåëè
- Mem.WriteWord(gTriggers[i].TexturePanelType);
+ //Mem.WriteWord(gTriggers[i].TexturePanelType);
// Âíóòðåííèé íîìåð äðóãîé ïàíåëè (ïî ñ÷àñòëèâîé ñëó÷àéíîñòè îí áóäåò ñîâïàäàòü ñ òåì, ÷òî ñîçäàíî ïðè çàãðóçêå êàðòû)
- Mem.WriteInt(gTriggers[i].trigPanelGUID);
+ utils.writeInt(st, LongInt(gTriggers[i].trigPanelGUID));
// Âðåìÿ äî âîçìîæíîñòè àêòèâàöèè
- Mem.WriteWord(gTriggers[i].TimeOut);
+ utils.writeInt(st, Word(gTriggers[i].TimeOut));
// UID òîãî, êòî àêòèâèðîâàë ýòîò òðèããåð
- Mem.WriteWord(gTriggers[i].ActivateUID);
+ utils.writeInt(st, Word(gTriggers[i].ActivateUID));
// Ñïèñîê UID-îâ îáúåêòîâ, êîòîðûå íàõîäèëèñü ïîä âîçäåéñòâèåì
actCount := Length(gTriggers[i].Activators);
- Mem.WriteInt(actCount);
+ utils.writeInt(st, LongInt(actCount));
for j := 0 to actCount-1 do
begin
// UID îáúåêòà
- Mem.WriteWord(gTriggers[i].Activators[j].UID);
+ utils.writeInt(st, Word(gTriggers[i].Activators[j].UID));
// Âðåìÿ îæèäàíèÿ
- Mem.WriteWord(gTriggers[i].Activators[j].TimeOut);
+ utils.writeInt(st, Word(gTriggers[i].Activators[j].TimeOut));
end;
// Ñòîèò ëè èãðîê â îáëàñòè òðèããåðà
- Mem.WriteBoolean(gTriggers[i].PlayerCollide);
+ utils.writeBool(st, gTriggers[i].PlayerCollide);
// Âðåìÿ äî çàêðûòèÿ äâåðè
- Mem.WriteInt(gTriggers[i].DoorTime);
+ utils.writeInt(st, LongInt(gTriggers[i].DoorTime));
// Çàäåðæêà àêòèâàöèè
- Mem.WriteInt(gTriggers[i].PressTime);
+ utils.writeInt(st, LongInt(gTriggers[i].PressTime));
// Ñ÷åò÷èê íàæàòèé
- Mem.WriteInt(gTriggers[i].PressCount);
+ utils.writeInt(st, LongInt(gTriggers[i].PressCount));
// Ñïàâíåð àêòèâåí
- Mem.WriteBoolean(gTriggers[i].AutoSpawn);
+ utils.writeBool(st, gTriggers[i].AutoSpawn);
// Çàäåðæêà ñïàâíåðà
- Mem.WriteInt(gTriggers[i].SpawnCooldown);
+ utils.writeInt(st, LongInt(gTriggers[i].SpawnCooldown));
// Ñ÷åò÷èê ñîçäàíèÿ îáúåêòîâ
- Mem.WriteInt(gTriggers[i].SpawnedCount);
+ utils.writeInt(st, LongInt(gTriggers[i].SpawnedCount));
// Ñêîëüêî ðàç ïðîèãðàí çâóê
- Mem.WriteInt(gTriggers[i].SoundPlayCount);
+ utils.writeInt(st, LongInt(gTriggers[i].SoundPlayCount));
// Ïðîèãðûâàåòñÿ ëè çâóê?
if (gTriggers[i].Sound <> nil) then b := gTriggers[i].Sound.IsPlaying() else b := false;
- Mem.WriteBoolean(b);
+ utils.writeBool(st, b);
if b then
begin
// Ïîçèöèÿ ïðîèãðûâàíèÿ çâóêà
- dw := gTriggers[i].Sound.GetPosition();
- Mem.WriteDWORD(dw);
+ utils.writeInt(st, LongWord(gTriggers[i].Sound.GetPosition()));
// Ãðîìêîñòü çâóêà
sg := gTriggers[i].Sound.GetVolume();
- sg := sg / (gSoundLevel/255.0);
- Mem.WriteSingle(sg);
+ sg := sg/(gSoundLevel/255.0);
+ //Mem.WriteSingle(sg);
+ st.WriteBuffer(sg, sizeof(sg)); // sorry
// Ñòåðåî ñìåùåíèå çâóêà
sg := gTriggers[i].Sound.GetPan();
- Mem.WriteSingle(sg);
+ //Mem.WriteSingle(sg);
+ st.WriteBuffer(sg, sizeof(sg)); // sorry
end;
// uservars
if (gTriggers[i].userVars = nil) then
begin
- Mem.WriteInt(0);
+ utils.writeInt(st, LongInt(0));
end
else
begin
- Mem.WriteInt(gTriggers[i].userVars.count);
+ utils.writeInt(st, LongInt(gTriggers[i].userVars.count)); //FIXME: check for overflow
for kv in gTriggers[i].userVars.byKeyValue do
begin
//writeln('<', kv.key, '>:<', VarToStr(kv.value), '>');
- Mem.WriteString(kv.key);
+ utils.writeStr(st, kv.key);
t := LongInt(varType(kv.value));
- Mem.WriteInt(t);
+ utils.writeInt(st, LongInt(t));
case t of
- varString: Mem.WriteString(AnsiString(kv.value));
- varBoolean: Mem.WriteBoolean(Boolean(kv.value));
- varShortInt: Mem.WriteInt(Integer(kv.value));
- varSmallint: Mem.WriteInt(Integer(kv.value));
- varInteger: Mem.WriteInt(Integer(kv.value));
+ varString: utils.writeStr(st, AnsiString(kv.value));
+ varBoolean: utils.writeBool(st, Boolean(kv.value));
+ varShortInt: utils.writeInt(st, LongInt(kv.value));
+ varSmallint: utils.writeInt(st, LongInt(kv.value));
+ varInteger: utils.writeInt(st, LongInt(kv.value));
//varInt64: Mem.WriteInt(Integer(kv.value));
- varByte: Mem.WriteInt(Integer(kv.value));
- varWord: Mem.WriteInt(Integer(kv.value));
- varLongWord: Mem.WriteInt(Integer(kv.value));
+ varByte: utils.writeInt(st, LongInt(kv.value));
+ varWord: utils.writeInt(st, LongInt(kv.value));
+ varLongWord: utils.writeInt(st, LongInt(kv.value));
//varQWord:
else raise Exception.CreateFmt('cannot save uservar ''%s''', [kv.key]);
end;
end;
-procedure g_Triggers_LoadState (var Mem: TBinMemoryReader);
+procedure g_Triggers_LoadState (st: TStream);
var
count, actCount, i, j, a: Integer;
dw: DWORD;
uvcount: Integer;
vt: LongInt;
vv: Variant;
- uvname: AnsiString;
- ustr: AnsiString;
+ uvname: AnsiString = '';
+ ustr: AnsiString = '';
uint: LongInt;
ubool: Boolean;
begin
- if (Mem = nil) then exit;
+ assert(st <> nil);
g_Triggers_Free();
// Êîëè÷åñòâî òðèããåðîâ
- Mem.ReadInt(count);
+ count := utils.readLongInt(st);
if (count = 0) then exit;
+ if (count < 0) or (count > 1024*1024) then raise XStreamError.Create('invalid trigger count');
for a := 0 to count-1 do
begin
// Ñèãíàòóðà òðèããåðà
- Mem.ReadDWORD(dw); // 'TRGX'
- if (dw <> TRIGGER_SIGNATURE) then raise EBinSizeError.Create('g_Triggers_LoadState: Wrong Trigger Signature');
+ if not utils.checkSign(st, 'TRGX') then raise XStreamError.Create('invalid trigger signature');
+ if (utils.readByte(st) <> 0) then raise XStreamError.Create('invalid trigger version');
// Òèï òðèããåðà
- Mem.ReadByte(Trig.TriggerType);
- // Ñïåöèàëüíûå äàííûå òðèããåðà: èíäåêñ â gCurrentMap.field['triggers']
+ Trig.TriggerType := utils.readByte(st);
if (Trig.TriggerType = TRIGGER_NONE) then continue; // empty one
- Mem.ReadInt(mapIndex);
+ // Ñïåöèàëüíûå äàííûå òðèããåðà: èíäåêñ â gCurrentMap.field['triggers']
+ mapIndex := utils.readLongInt(st);
i := g_Triggers_CreateWithMapIndex(Trig, a, mapIndex);
- // Êîîðäèíàòû ëåâîãî âåðõíåãî óãëà:
- Mem.ReadInt(gTriggers[i].X);
- Mem.ReadInt(gTriggers[i].Y);
- // Ðàçìåðû:
- Mem.ReadWord(gTriggers[i].Width);
- Mem.ReadWord(gTriggers[i].Height);
- // Âêëþ÷åí ëè òðèããåð:
- Mem.ReadBoolean(gTriggers[i].Enabled);
- // Òèï àêòèâàöèè òðèããåðà:
- Mem.ReadByte(gTriggers[i].ActivateType);
- // Êëþ÷è, íåîáõîäèìûå äëÿ àêòèâàöèè:
- Mem.ReadByte(gTriggers[i].Keys);
- // ID ïàíåëè, òåêñòóðà êîòîðîé èçìåíèòñÿ:
- Mem.ReadInt(gTriggers[i].TexturePanelGUID);
- // Òèï ýòîé ïàíåëè:
- Mem.ReadWord(gTriggers[i].TexturePanelType);
- // Âíóòðåííèé íîìåð äðóãîé ïàíåëè (ïî ñ÷àñòëèâîé ñëó÷àéíîñòè îí áóäåò ñîâïàäàòü ñ òåì, ÷òî ñîçäàíî ïðè çàãðóçêå êàðòû)
- Mem.ReadInt(gTriggers[i].trigPanelGUID);
- // Âðåìÿ äî âîçìîæíîñòè àêòèâàöèè:
- Mem.ReadWord(gTriggers[i].TimeOut);
- // UID òîãî, êòî àêòèâèðîâàë ýòîò òðèããåð:
- Mem.ReadWord(gTriggers[i].ActivateUID);
- // Ñïèñîê UID-îâ îáúåêòîâ, êîòîðûå íàõîäèëèñü ïîä âîçäåéñòâèåì:
- Mem.ReadInt(actCount);
- if actCount > 0 then
+ // Êîîðäèíàòû ëåâîãî âåðõíåãî óãëà
+ gTriggers[i].X := utils.readLongInt(st);
+ gTriggers[i].Y := utils.readLongInt(st);
+ // Ðàçìåðû
+ gTriggers[i].Width := utils.readWord(st);
+ gTriggers[i].Height := utils.readWord(st);
+ // Âêëþ÷åí ëè òðèããåð
+ gTriggers[i].Enabled := utils.readBool(st);
+ // Òèï àêòèâàöèè òðèããåðà
+ gTriggers[i].ActivateType := utils.readByte(st);
+ // Êëþ÷è, íåîáõîäèìûå äëÿ àêòèâàöèè
+ gTriggers[i].Keys := utils.readByte(st);
+ // ID ïàíåëè, òåêñòóðà êîòîðîé èçìåíèòñÿ
+ gTriggers[i].TexturePanelGUID := utils.readLongInt(st);
+ // Òèï ýòîé ïàíåëè
+ //Mem.ReadWord(gTriggers[i].TexturePanelType);
+ // Âíóòðåííèé íîìåð äðóãîé ïàíåëè (ïî ñ÷àñòëèâîé ñëó÷àéíîñòè îí áóäåò ñîâïàäàòü ñ òåì, ÷òî ñîçäàíî ïðè çàãðóçêå êàðòû)
+ gTriggers[i].trigPanelGUID := utils.readLongInt(st);
+ // Âðåìÿ äî âîçìîæíîñòè àêòèâàöèè
+ gTriggers[i].TimeOut := utils.readWord(st);
+ // UID òîãî, êòî àêòèâèðîâàë ýòîò òðèããåð
+ gTriggers[i].ActivateUID := utils.readWord(st);
+ // Ñïèñîê UID-îâ îáúåêòîâ, êîòîðûå íàõîäèëèñü ïîä âîçäåéñòâèåì
+ actCount := utils.readLongInt(st);
+ if (actCount < 0) or (actCount > 1024*1024) then raise XStreamError.Create('invalid activated object count');
+ if (actCount > 0) then
begin
SetLength(gTriggers[i].Activators, actCount);
for j := 0 to actCount-1 do
begin
// UID îáúåêòà
- Mem.ReadWord(gTriggers[i].Activators[j].UID);
+ gTriggers[i].Activators[j].UID := utils.readWord(st);
// Âðåìÿ îæèäàíèÿ
- Mem.ReadWord(gTriggers[i].Activators[j].TimeOut);
+ gTriggers[i].Activators[j].TimeOut := utils.readWord(st);
end;
end;
- // Ñòîèò ëè èãðîê â îáëàñòè òðèããåðà:
- Mem.ReadBoolean(gTriggers[i].PlayerCollide);
- // Âðåìÿ äî çàêðûòèÿ äâåðè:
- Mem.ReadInt(gTriggers[i].DoorTime);
- // Çàäåðæêà àêòèâàöèè:
- Mem.ReadInt(gTriggers[i].PressTime);
- // Ñ÷åò÷èê íàæàòèé:
- Mem.ReadInt(gTriggers[i].PressCount);
- // Ñïàâíåð àêòèâåí:
- Mem.ReadBoolean(gTriggers[i].AutoSpawn);
- // Çàäåðæêà ñïàâíåðà:
- Mem.ReadInt(gTriggers[i].SpawnCooldown);
- // Ñ÷åò÷èê ñîçäàíèÿ îáúåêòîâ:
- Mem.ReadInt(gTriggers[i].SpawnedCount);
- // Ñêîëüêî ðàç ïðîèãðàí çâóê:
- Mem.ReadInt(gTriggers[i].SoundPlayCount);
- // Ïðîèãðûâàåòñÿ ëè çâóê?
- Mem.ReadBoolean(b);
+ // Ñòîèò ëè èãðîê â îáëàñòè òðèããåðà
+ gTriggers[i].PlayerCollide := utils.readBool(st);
+ // Âðåìÿ äî çàêðûòèÿ äâåðè
+ gTriggers[i].DoorTime := utils.readLongInt(st);
+ // Çàäåðæêà àêòèâàöèè
+ gTriggers[i].PressTime := utils.readLongInt(st);
+ // Ñ÷åò÷èê íàæàòèé
+ gTriggers[i].PressCount := utils.readLongInt(st);
+ // Ñïàâíåð àêòèâåí
+ gTriggers[i].AutoSpawn := utils.readBool(st);
+ // Çàäåðæêà ñïàâíåðà
+ gTriggers[i].SpawnCooldown := utils.readLongInt(st);
+ // Ñ÷åò÷èê ñîçäàíèÿ îáúåêòîâ
+ gTriggers[i].SpawnedCount := utils.readLongInt(st);
+ // Ñêîëüêî ðàç ïðîèãðàí çâóê
+ gTriggers[i].SoundPlayCount := utils.readLongInt(st);
+ // Ïðîèãðûâàåòñÿ ëè çâóê?
+ b := utils.readBool(st);
if b then
begin
- // Ïîçèöèÿ ïðîèãðûâàíèÿ çâóêà:
- Mem.ReadDWORD(dw);
- // Ãðîìêîñòü çâóêà:
- Mem.ReadSingle(vol);
- // Ñòåðåî ñìåùåíèå çâóêà:
- Mem.ReadSingle(pan);
- // Çàïóñêàåì çâóê, åñëè åñòü:
- if gTriggers[i].Sound <> nil then
+ // Ïîçèöèÿ ïðîèãðûâàíèÿ çâóêà
+ dw := utils.readLongWord(st);
+ // Ãðîìêîñòü çâóêà
+ //Mem.ReadSingle(vol);
+ st.ReadBuffer(vol, sizeof(vol)); // sorry
+ // Ñòåðåî ñìåùåíèå çâóêà
+ //Mem.ReadSingle(pan);
+ st.ReadBuffer(pan, sizeof(pan)); // sorry
+ // Çàïóñêàåì çâóê, åñëè åñòü
+ if (gTriggers[i].Sound <> nil) then
begin
gTriggers[i].Sound.PlayPanVolume(pan, vol);
gTriggers[i].Sound.Pause(True);
// uservars
gTriggers[i].userVars.Free();
gTriggers[i].userVars := nil;
- Mem.ReadInt(uvcount);
+ uvcount := utils.readLongInt(st);
+ if (uvcount < 0) or (uvcount > 1024*1024) then raise XStreamError.Create('invalid number of user vars in trigger');
if (uvcount > 0) then
begin
gTriggers[i].userVars := THashStrVariant.Create(hsihash, hsiequ);
while (uvcount > 0) do
begin
Dec(uvcount);
- uvname := '';
- Mem.ReadString(uvname);
- Mem.ReadInt(vt);
+ uvname := utils.readStr(st);
+ vt := utils.readLongInt(st);
case vt of
- varString: begin ustr := ''; Mem.ReadString(ustr); vv := ustr; end;
- varBoolean: begin Mem.ReadBoolean(ubool); vv := ubool; end;
- varShortInt: begin Mem.ReadInt(uint); vv := ShortInt(uint); end;
- varSmallint: begin Mem.ReadInt(uint); vv := SmallInt(uint); end;
- varInteger: begin Mem.ReadInt(uint); vv := LongInt(uint); end;
- varByte: begin Mem.ReadInt(uint); vv := Byte(uint); end;
- varWord: begin Mem.ReadInt(uint); vv := Word(uint); end;
- varLongWord: begin Mem.ReadInt(uint); vv := LongWord(uint); end;
+ varString: begin ustr := utils.readStr(st); vv := ustr; end;
+ varBoolean: begin ubool := utils.readBool(st); vv := ubool; end;
+ varShortInt: begin uint := utils.readLongInt(st); vv := ShortInt(uint); end;
+ varSmallint: begin uint := utils.readLongInt(st); vv := SmallInt(uint); end;
+ varInteger: begin uint := utils.readLongInt(st); vv := LongInt(uint); end;
+ varByte: begin uint := utils.readLongInt(st); vv := Byte(uint); end;
+ varWord: begin uint := utils.readLongInt(st); vv := Word(uint); end;
+ varLongWord: begin uint := utils.readLongInt(st); vv := LongWord(uint); end;
else raise Exception.CreateFmt('cannot load uservar ''%s''', [uvname]);
end;
gTriggers[i].userVars.put(uvname, vv);