index 664faf687e9e8c9053b7244837df1dacb6ab3aad..174b47e6594ca44e0a0429705ebb039b4394af67 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.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
xdynrec, hashtable, exoma;
type
- THashStrVariant = specialize THashBase<AnsiString, Variant>;
-
TActivator = record
UID: Word;
TimeOut: Word;
function trigCenter (): TDFPoint; inline;
end;
-function g_Triggers_Create(Trigger: TTrigger; trec: TDynRecord; forceInternalIndex: Integer=-1): DWORD;
+function g_Triggers_Create (aTrigger: TTrigger; trec: TDynRecord; forceInternalIndex: Integer=-1): DWORD;
procedure g_Triggers_Update();
procedure g_Triggers_Press(ID: DWORD; ActivateType: Byte; ActivateUID: Word = 0);
function g_Triggers_PressR(X, Y: Integer; Width, Height: Word; UID: Word;
if (Length(afldname) > 4) and (afldname[1] = 'u') and (afldname[2] = 's') and
(afldname[3] = 'e') and (afldname[4] = 'r') then
begin
- if (me.userVars = nil) then me.userVars := THashStrVariant.Create(hsihash, hsiequ);
+ if (me.userVars = nil) then me.userVars := THashStrVariant.Create();
me.userVars.put(afldname, aval);
exit;
end;
if (gLifts[PanelID].PanelType = PANEL_LIFTUP) or (gLifts[PanelID].PanelType = PANEL_LIFTDOWN) then
begin
case d of
- 0: t := 0;
- 1: t := 1;
- else t := IfThen(gLifts[PanelID].LiftType = 1, 0, 1);
+ 0: t := LIFTTYPE_UP;
+ 1: t := LIFTTYPE_DOWN;
+ else t := IfThen(gLifts[PanelID].LiftType = LIFTTYPE_DOWN, LIFTTYPE_UP, LIFTTYPE_DOWN);
end
end
else if (gLifts[PanelID].PanelType = PANEL_LIFTLEFT) or (gLifts[PanelID].PanelType = PANEL_LIFTRIGHT) then
begin
case d of
- 0: t := 2;
- 1: t := 3;
- else t := IfThen(gLifts[PanelID].LiftType = 2, 3, 2);
+ 0: t := LIFTTYPE_LEFT;
+ 1: t := LIFTTYPE_RIGHT;
+ else t := IfThen(gLifts[PanelID].LiftType = LIFTTYPE_LEFT, LIFTTYPE_RIGHT, LIFTTYPE_LEFT);
end;
end;
snd := 'SOUND_WEAPON_EXPLODEBFG';
end;
+ TRIGGER_SHOT_FLAME:
+ begin
+ g_Weapon_flame(wx, wy, dx, dy, 0, -1, True);
+ snd := 'SOUND_GAME_BURNING';
+ end;
+
else exit;
end;
dx += Random(tgcAccuracy)-Random(tgcAccuracy);
dy += Random(tgcAccuracy)-Random(tgcAccuracy);
- tr_SpawnShot(tgcShotType, wx, wy, dx, dy, not tgcQuiet, TargetUID);
+ tr_SpawnShot(tgcShotType, wx, wy, dx, dy, tgcShotSound, TargetUID);
end
else
begin
Result := True;
if gLMSRespawn = LMS_RESPAWN_NONE then
begin
- g_Player_Get(ActivateUID).GetSecret();
+ p := g_Player_Get(ActivateUID);
+ p.GetSecret();
Inc(gCoopSecretsFound);
- if g_Game_IsNet then MH_SEND_GameStats();
+ if g_Game_IsNet then
+ begin
+ MH_SEND_GameStats();
+ if p.FClientID >= 0 then
+ MH_SEND_GameEvent(NET_EV_SECRET, p.UID, '');
+ end;
end;
end;
for k := 1 to tgcMonsCount do
begin
if (actType = ACTIVATE_CUSTOM) and (tgcDelay > 0) then
- SpawnCooldown := tgcDelay;
+ SpawnCooldown := -1; // Çàäåðæêà âûñòàâèòñÿ ìîíñòðîì ïðè óíè÷òîæåíèè
if (tgcMax > 0) and (SpawnedCount >= tgcMax) then
Break;
gMonstersSpawned[High(gMonstersSpawned)] := mon.UID;
end;
- if tgcMax > 0 then
- begin
- mon.SpawnTrigger := ID;
- Inc(SpawnedCount);
- end;
+ mon.SpawnTrigger := ID;
+ if tgcMax > 0 then Inc(SpawnedCount);
case tgcEffect of
EFFECT_TELEPORT: begin
for k := 1 to tgcItemCount do
begin
if (actType = ACTIVATE_CUSTOM) and (tgcDelay > 0) then
- SpawnCooldown := tgcDelay;
+ SpawnCooldown := -1; // Çàäåðæêà âûñòàâèòñÿ èòåìîì ïðè óíè÷òîæåíèè
if (tgcMax > 0) and (SpawnedCount >= tgcMax) then
Break;
Result := True;
- if tgcMax > 0 then
- begin
- it := g_Items_ByIdx(iid);
- it.SpawnTrigger := ID;
- Inc(SpawnedCount);
- end;
+ it := g_Items_ByIdx(iid);
+ it.SpawnTrigger := ID;
+ if tgcMax > 0 then Inc(SpawnedCount);
case tgcEffect of
EFFECT_TELEPORT: begin
Dec(idx);
end;
TimeOut := tgcWait;
+ result := true;
end;
end;
end;
end;
-function g_Triggers_CreateWithMapIndex (Trigger: TTrigger; arridx, mapidx: Integer): DWORD;
+function g_Triggers_CreateWithMapIndex (aTrigger: TTrigger; arridx, mapidx: Integer): DWORD;
var
triggers: TDynField;
begin
triggers := gCurrentMap['trigger'];
if (triggers = nil) then raise Exception.Create('LOAD: map has no triggers');
if (mapidx < 0) or (mapidx >= triggers.count) then raise Exception.Create('LOAD: invalid map trigger index');
- //Trigger.trigDataRec := triggers.itemAt[mapidx];
- //if (Trigger.trigDataRec = nil) then raise Exception.Create('LOAD: internal error in trigger loader');
- //Trigger.mapId := Trigger.trigDataRec.id;
- Trigger.mapIndex := mapidx;
- {
- if (Trigger.trigDataRec.trigRec <> nil) then
- begin
- Trigger.trigDataRec := Trigger.trigDataRec.trigRec.clone(nil);
- end
- else
- begin
- Trigger.trigDataRec := nil;
- end;
- }
- result := g_Triggers_Create(Trigger, triggers.itemAt[mapidx], arridx);
+ aTrigger.mapIndex := mapidx;
+ result := g_Triggers_Create(aTrigger, triggers.itemAt[mapidx], arridx);
end;
-function g_Triggers_Create(Trigger: TTrigger; trec: TDynRecord; forceInternalIndex: Integer=-1): DWORD;
+function g_Triggers_Create (aTrigger: TTrigger; trec: TDynRecord; forceInternalIndex: Integer=-1): DWORD;
var
find_id: DWORD;
fn, mapw: AnsiString;
f, olen: Integer;
+ ptg: PTrigger;
begin
if (tgscope = nil) then tgscope := TTrigScope.Create();
if (tgclist = nil) then tgclist := TMyConstList.Create();
// Íå ñîçäàâàòü âûõîä, åñëè èãðà áåç âûõîäà
- if (Trigger.TriggerType = TRIGGER_EXIT) and
+ if (aTrigger.TriggerType = TRIGGER_EXIT) and
(not LongBool(gGameSettings.Options and GAME_OPTION_ALLOWEXIT)) then
- Trigger.TriggerType := TRIGGER_NONE;
+ begin
+ aTrigger.TriggerType := TRIGGER_NONE;
+ end;
// Åñëè ìîíñòðû çàïðåùåíû, îòìåíÿåì òðèããåð
- if (Trigger.TriggerType = TRIGGER_SPAWNMONSTER) and
+ if (aTrigger.TriggerType = TRIGGER_SPAWNMONSTER) and
(not LongBool(gGameSettings.Options and GAME_OPTION_MONSTERS)) and
(gGameSettings.GameType <> GT_SINGLE) then
- Trigger.TriggerType := TRIGGER_NONE;
+ begin
+ aTrigger.TriggerType := TRIGGER_NONE;
+ end;
// Ñ÷èòàåì êîëè÷åñòâî ñåêðåòîâ íà êàðòå
- if Trigger.TriggerType = TRIGGER_SECRET then gSecretsCount += 1;
+ if (aTrigger.TriggerType = TRIGGER_SECRET) then gSecretsCount += 1;
if (forceInternalIndex < 0) then
begin
gTriggers[f].userVars := nil;
find_id := DWORD(forceInternalIndex);
end;
- gTriggers[find_id] := Trigger;
+ gTriggers[find_id] := aTrigger;
+ ptg := @gTriggers[find_id];
- Trigger.mapId := trec.id;
+ ptg.mapId := trec.id;
// clone trigger data
if (trec.trigRec = nil) then
begin
- gTriggers[find_id].trigDataRec := nil;
+ ptg.trigDataRec := nil;
//HACK!
- if (gTriggers[find_id].TriggerType <> TRIGGER_SECRET) then
+ if (ptg.TriggerType <> TRIGGER_SECRET) then
begin
- e_LogWritefln('trigger of type %s has no triggerdata; wtf?!', [gTriggers[find_id].TriggerType], TMsgType.Warning);
+ e_LogWritefln('trigger of type %s has no triggerdata; wtf?!', [ptg.TriggerType], TMsgType.Warning);
end;
end
else
begin
- gTriggers[find_id].trigDataRec := trec.trigRec.clone(nil);
+ ptg.trigDataRec := trec.trigRec.clone(nil);
end;
- with gTriggers[find_id] do
+ with ptg^ do
begin
ID := find_id;
// if this type of trigger exists both on the client and on the server
// use an uniform numeration
- if Trigger.TriggerType = TRIGGER_SOUND then
+ ClientID := 0;
+ if (ptg.TriggerType = TRIGGER_SOUND) then
begin
Inc(gTriggerClientID);
ClientID := gTriggerClientID;
- end
- else
- begin
- ClientID := 0;
end;
TimeOut := 0;
ActivateUID := 0;
end;
// update cached trigger variables
- trigUpdateCacheData(gTriggers[find_id], gTriggers[find_id].trigDataRec);
+ trigUpdateCacheData(ptg^, ptg.trigDataRec);
- gTriggers[find_id].userVars := nil; //THashStrVariant.Create(hsihash, hsiequ);
+ ptg.userVars := nil;
try
- gTriggers[find_id].exoThink := TExprBase.parseStatList(tgclist, VarToStr(trec.user['exoma_think']));
+ ptg.exoThink := TExprBase.parseStatList(tgclist, VarToStr(trec.user['exoma_think']));
except
on e: TExomaParseException do
begin
conwritefln('*** ERROR parsing exoma_think (%s,%s): %s [%s]', [e.tokLine, e.tokCol, e.message, VarToStr(trec.user['exoma_think'])]);
- gTriggers[find_id].exoThink := nil;
+ ptg.exoThink := nil;
end;
else
raise;
end;
try
- gTriggers[find_id].exoCheck := TExprBase.parse(tgclist, VarToStr(trec.user['exoma_check']));
+ ptg.exoCheck := TExprBase.parse(tgclist, VarToStr(trec.user['exoma_check']));
except
on e: TExomaParseException do
begin
conwritefln('*** ERROR parsing exoma_check (%s,%s): %s [%s]', [e.tokLine, e.tokCol, e.message, VarToStr(trec.user['exoma_check'])]);
- gTriggers[find_id].exoCheck := nil;
+ ptg.exoCheck := nil;
end;
else
raise;
end;
try
- gTriggers[find_id].exoAction := TExprBase.parseStatList(tgclist, VarToStr(trec.user['exoma_action']));
+ ptg.exoAction := TExprBase.parseStatList(tgclist, VarToStr(trec.user['exoma_action']));
except
on e: TExomaParseException do
begin
conwritefln('*** ERROR parsing exoma_action (%s,%s): %s [%s]', [e.tokLine, e.tokCol, e.message, VarToStr(trec.user['exoma_action'])]);
- gTriggers[find_id].exoAction := nil;
+ ptg.exoAction := nil;
end;
else
raise;
end;
try
- gTriggers[find_id].exoInit := TExprBase.parseStatList(tgclist, VarToStr(trec.user['exoma_init']));
+ ptg.exoInit := TExprBase.parseStatList(tgclist, VarToStr(trec.user['exoma_init']));
except
on e: TExomaParseException do
begin
conwritefln('*** ERROR parsing exoma_init (%s,%s): %s [%s]', [e.tokLine, e.tokCol, e.message, VarToStr(trec.user['exoma_init'])]);
- gTriggers[find_id].exoInit := nil;
+ ptg.exoInit := nil;
end;
else
raise;
end;
- if (forceInternalIndex < 0) and (gTriggers[find_id].exoInit <> nil) then
+ if (forceInternalIndex < 0) and (ptg.exoInit <> nil) then
begin
//conwritefln('executing trigger init: [%s]', [gTriggers[find_id].exoInit.toString()]);
try
- tgscope.me := @gTriggers[find_id];
- gTriggers[find_id].exoInit.value(tgscope);
+ tgscope.me := ptg;
+ ptg.exoInit.value(tgscope);
tgscope.me := nil;
except
tgscope.me := nil;
- conwritefln('*** trigger exoactivate error: %s', [gTriggers[find_id].exoInit.toString()]);
+ conwritefln('*** trigger exoactivate error: %s', [ptg.exoInit.toString()]);
exit;
end;
end;
// Çàãðóæàåì çâóê, åñëè ýòî òðèããåð "Çâóê"
- if (Trigger.TriggerType = TRIGGER_SOUND) and (Trigger.tgcSoundName <> '') then
+ if (ptg.TriggerType = TRIGGER_SOUND) and (ptg.tgcSoundName <> '') then
begin
// Åùå íåò òàêîãî çâóêà
- if not g_Sound_Exists(Trigger.tgcSoundName) then
+ if not g_Sound_Exists(ptg.tgcSoundName) then
begin
- fn := g_ExtractWadName(Trigger.tgcSoundName);
- if fn = '' then
+ fn := g_ExtractWadName(ptg.tgcSoundName);
+ if (fn = '') then
begin // Çâóê â ôàéëå ñ êàðòîé
mapw := g_ExtractWadName(gMapInfo.Map);
- fn := mapw+':'+g_ExtractFilePathName(Trigger.tgcSoundName);
+ fn := mapw+':'+g_ExtractFilePathName(ptg.tgcSoundName);
end
else // Çâóê â îòäåëüíîì ôàéëå
begin
- fn := GameDir + '/wads/' + Trigger.tgcSoundName;
+ fn := GameDir + '/wads/' + ptg.tgcSoundName;
end;
- if not g_Sound_CreateWADEx(Trigger.tgcSoundName, fn) then
+ //e_LogWritefln('loading trigger sound ''%s''', [fn]);
+ if not g_Sound_CreateWADEx(ptg.tgcSoundName, fn) then
begin
- g_FatalError(Format(_lc[I_GAME_ERROR_TR_SOUND], [fn, Trigger.tgcSoundName]));
+ g_FatalError(Format(_lc[I_GAME_ERROR_TR_SOUND], [fn, ptg.tgcSoundName]));
end;
end;
// Ñîçäàåì îáúåêò çâóêà
- with gTriggers[find_id] do
+ with ptg^ do
begin
Sound := TPlayableSound.Create();
- if not Sound.SetByName(Trigger.tgcSoundName) then
+ if not Sound.SetByName(ptg.tgcSoundName) then
begin
Sound.Free();
Sound := nil;
end;
// Çàãðóæàåì ìóçûêó, åñëè ýòî òðèããåð "Ìóçûêà"
- if (Trigger.TriggerType = TRIGGER_MUSIC) and (Trigger.tgcMusicName <> '') then
+ if (ptg.TriggerType = TRIGGER_MUSIC) and (ptg.tgcMusicName <> '') then
begin
// Åùå íåò òàêîé ìóçûêè
- if not g_Sound_Exists(Trigger.tgcMusicName) then
+ if not g_Sound_Exists(ptg.tgcMusicName) then
begin
- fn := g_ExtractWadName(Trigger.tgcMusicName);
+ fn := g_ExtractWadName(ptg.tgcMusicName);
if fn = '' then
begin // Ìóçûêà â ôàéëå ñ êàðòîé
mapw := g_ExtractWadName(gMapInfo.Map);
- fn := mapw+':'+g_ExtractFilePathName(Trigger.tgcMusicName);
+ fn := mapw+':'+g_ExtractFilePathName(ptg.tgcMusicName);
end
else // Ìóçûêà â ôàéëå ñ êàðòîé
begin
- fn := GameDir+'/wads/'+Trigger.tgcMusicName;
+ fn := GameDir+'/wads/'+ptg.tgcMusicName;
end;
- if not g_Sound_CreateWADEx(Trigger.tgcMusicName, fn, True) then
+ if not g_Sound_CreateWADEx(ptg.tgcMusicName, fn, True) then
begin
- g_FatalError(Format(_lc[I_GAME_ERROR_TR_SOUND], [fn, Trigger.tgcMusicName]));
+ g_FatalError(Format(_lc[I_GAME_ERROR_TR_SOUND], [fn, ptg.tgcMusicName]));
end;
end;
end;
// Çàãðóæàåì äàííûå òðèããåðà "Òóðåëü"
- if Trigger.TriggerType = TRIGGER_SHOT then
+ if (ptg.TriggerType = TRIGGER_SHOT) then
begin
- with gTriggers[find_id] do
+ with ptg^ do
begin
ShotPanelTime := 0;
ShotSightTime := 0;
ShotSightTimeout := 0;
ShotSightTarget := 0;
ShotSightTargetN := 0;
- ShotAmmoCount := Trigger.tgcAmmo;
+ ShotAmmoCount := ptg.tgcAmmo;
ShotReloadTime := 0;
end;
end;
procedure g_Triggers_DecreaseSpawner(ID: DWORD);
begin
if (gTriggers <> nil) then
- if gTriggers[ID].SpawnedCount > 0 then
- Dec(gTriggers[ID].SpawnedCount);
+ begin
+ if gTriggers[ID].tgcMax > 0 then
+ begin
+ if gTriggers[ID].SpawnedCount > 0 then
+ Dec(gTriggers[ID].SpawnedCount);
+ end;
+ if gTriggers[ID].tgcDelay > 0 then
+ begin
+ if gTriggers[ID].SpawnCooldown < 0 then
+ gTriggers[ID].SpawnCooldown := gTriggers[ID].tgcDelay;
+ end;
+ end;
end;
-
procedure g_Triggers_Free ();
var
a: Integer;
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);
+ gTriggers[i].userVars := THashStrVariant.Create();
vv := Unassigned;
while (uvcount > 0) do
begin