summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 698e607)
raw | patch | inline | side by side (parent: 698e607)
| author | Ketmar Dark <ketmar@ketmar.no-ip.org> | |
| Thu, 7 Sep 2017 03:29:40 +0000 (06:29 +0300) | ||
| committer | Ketmar Dark <ketmar@ketmar.no-ip.org> | |
| Thu, 7 Sep 2017 03:30:47 +0000 (06:30 +0300) |
| src/game/g_game.pas | patch | blob | history | |
| src/game/g_holmes.pas | patch | blob | history | |
| src/game/g_main.pas | patch | blob | history | |
| src/game/g_map.pas | patch | blob | history | |
| src/game/g_netmsg.pas | patch | blob | history | |
| src/game/g_triggers.pas | patch | blob | history | |
| src/shared/MAPDEF.pas | patch | blob | history | |
| src/shared/mapdef_tgc_def.inc | [new file with mode: 0644] | patch | blob |
| src/shared/mapdef_tgc_impl.inc | [new file with mode: 0644] | patch | blob |
| src/tools/mapgen.dpr | patch | blob | history |
diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 467c13f1dcef4fabbfc06d6ddf07acaf08e23fd9..73c8ddf3a8c60127b66c8c7a37349a50b52abad2 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
g_Console_Add('player left the map');
gExitByTrigger := True;
//g_Game_ExitLevel(gTriggers[a].Data.MapName);
- g_Game_ExitLevel(gTriggers[a].trigData.trigMap);
+ g_Game_ExitLevel(gTriggers[a].tgcMap);
break;
end;
end;
begin
gExitByTrigger := True;
//gNextMap := gTriggers[a].Data.MapName;
- gNextMap := gTriggers[a].trigData.trigMap;
+ gNextMap := gTriggers[a].tgcMap;
Break;
end;
// Èùåì ñëåäóþùóþ êàðòó â WAD ôàéëå
with gTriggers[i] do
if (TriggerType = TRIGGER_SOUND) and
(Sound <> nil) and
- (trigData.trigLocal) and
+ (tgcLocal) and
Sound.IsPlaying() then
begin
if ((gPlayer1 <> nil) and g_CollidePoint(gPlayer1.GameX, gPlayer1.GameY, X, Y, Width, Height)) or
((gPlayer2 <> nil) and g_CollidePoint(gPlayer2.GameX, gPlayer2.GameY, X, Y, Width, Height)) then
begin
- Sound.SetPan(0.5 - trigData.trigPan/255.0);
- Sound.SetVolume(trigData.trigVolume/255.0);
+ Sound.SetPan(0.5 - tgcPan/255.0);
+ Sound.SetVolume(tgcVolume/255.0);
end
else
- Sound.SetCoords(X+(Width div 2), Y+(Height div 2), trigData.trigVolume/255.0);
+ Sound.SetCoords(X+(Width div 2), Y+(Height div 2), tgcVolume/255.0);
end;
end;
diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index 9d215455e8fbbafe8c72f0ed67d3e9c1042fae61..6d52559b7e7c281d5743393e187c574be123dae2 100644 (file)
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
TRIGGER_TEXTURE: begin end;
TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF, TRIGGER_PRESS:
begin
- if (trig.trigData.trigTWidth > 0) and (trig.trigData.trigTHeight > 0) then
+ if (trig.trigDataRec.trigTWidth > 0) and (trig.trigDataRec.trigTHeight > 0) then
begin
fillRect(
- trig.trigData.trigTX, trig.trigData.trigTY,
- trig.trigData.trigTWidth, trig.trigData.trigTHeight,
+ trig.trigDataRec.trigTX, trig.trigDataRec.trigTY,
+ trig.trigDataRec.trigTWidth, trig.trigDataRec.trigTHeight,
0, 255, 255, 42);
drawLine(
trig.trigCenter.x, trig.trigCenter.y,
- trig.trigData.trigTX+trig.trigData.trigTWidth div 2,
- trig.trigData.trigTY+trig.trigData.trigTHeight div 2,
+ trig.trigDataRec.trigTX+trig.trigDataRec.trigTWidth div 2,
+ trig.trigDataRec.trigTY+trig.trigDataRec.trigTHeight div 2,
255, 0, 255, 220);
end;
end;
diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index f3e38724fb0183a50c394b9ceafff886dfc70f4c..da95b14b6b47bde14d9773a97ac58f638fec6489 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
begin
gExitByTrigger := True;
//g_Game_ExitLevel(gTriggers[a].Data.MapName);
- g_Game_ExitLevel(gTriggers[a].trigData.trigMap);
+ g_Game_ExitLevel(gTriggers[a].tgcMap);
Break;
end;
goto Cheated;
diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index caedf4bbaf1e2425ad100c73f637dc556d2a84d9..e976be49c616045a92b12fd0b2c4844fd9227be2 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
//Data.Default := Trigger.DATA;
if (Trigger.trigRec = nil) then
begin
- trigData := nil;
+ trigDataRec := nil;
+ //HACK!
if (TriggerType <> TRIGGER_SECRET) then
begin
e_LogWritefln('trigger of type %s has no triggerdata; wtf?!', [TriggerType], MSG_WARNING);
end
else
begin
- trigData := Trigger.trigRec.clone(nil);
+ trigDataRec := Trigger.trigRec.clone(nil);
end;
end;
if gTriggers[a].TriggerType in [TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then
begin
//if (gTriggers[a].Data.MonsterID-1) = Integer(mon.StartID) then mon.AddTrigger(a);
- if (gTriggers[a].trigData.trigMonsterId) = Integer(mon.StartID) then mon.AddTrigger(a);
+ if (gTriggers[a].trigDataRec.trigMonsterId) = Integer(mon.StartID) then mon.AddTrigger(a);
end;
end;
end;
tw.Free();
end;
}
- if (gTriggers[a].trigData.trigMonsterId) = Integer(mon.StartID) then mon.AddTrigger(a);
+ if (gTriggers[a].trigDataRec.trigMonsterId) = Integer(mon.StartID) then mon.AddTrigger(a);
end;
end;
end;
diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 822ae9bec9edd7f83cd947bcd02f5865e786773e..3a2304bb005bca95012c7b85563ee780dddef21e 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
begin
if SPlaying then
begin
- if trigData.trigLocal then
- Sound.PlayVolumeAt(X+(Width div 2), Y+(Height div 2), trigData.trigVolume/255.0)
+ if tgcLocal then
+ Sound.PlayVolumeAt(X+(Width div 2), Y+(Height div 2), tgcVolume/255.0)
else
- Sound.PlayPanVolume((trigData.trigPan-127.0)/128.0, trigData.trigVolume/255.0);
+ Sound.PlayPanVolume((tgcPan-127.0)/128.0, tgcVolume/255.0);
Sound.SetPosition(SPos);
end
else
index 6e57873ec65f20e77deee928e1b1b7730f5e74c5..2d19853372178e21d863f10c8f39d9d521ccca57 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
trigPanelGUID: Integer;
//TrigData: TTriggerData;
- trigData: TDynRecord; // triggerdata; owned by trigger
+ trigDataRec: TDynRecord; // triggerdata; owned by trigger
+
+ {$INCLUDE ../shared/mapdef_tgc_def.inc}
public
function trigCenter (): TDFPoint; inline;
TRIGGER_SIGNATURE = $58475254; // 'TRGX'
TRAP_DAMAGE = 1000;
+{$INCLUDE ../shared/mapdef_tgc_impl.inc}
function TTrigger.trigCenter (): TDFPoint; inline;
begin
@@ -687,7 +690,7 @@ procedure MakeShot (var Trigger: TTrigger; wx, wy, dx, dy: Integer; TargetUID: W
begin
with Trigger do
begin
- if (trigData.trigAmmo = 0) or ((trigData.trigAmmo > 0) and (ShotAmmoCount > 0)) then
+ if (tgcAmmo = 0) or ((tgcAmmo > 0) and (ShotAmmoCount > 0)) then
begin
if (trigShotPanelGUID <> -1) and (ShotPanelTime = 0) then
begin
ShotPanelTime := 4; // òèêîâ íà âñïûøêó âûñòðåëà
end;
- if (trigData.trigSight > 0) then ShotSightTimeout := 180; // ~= 5 ñåêóíä
+ if (tgcSight > 0) then ShotSightTimeout := 180; // ~= 5 ñåêóíä
if (ShotAmmoCount > 0) then Dec(ShotAmmoCount);
- dx += Random(trigData.trigAccuracy)-Random(trigData.trigAccuracy);
- dy += Random(trigData.trigAccuracy)-Random(trigData.trigAccuracy);
+ dx += Random(tgcAccuracy)-Random(tgcAccuracy);
+ dy += Random(tgcAccuracy)-Random(tgcAccuracy);
- tr_SpawnShot(trigData.trigShotType, wx, wy, dx, dy, not trigData.trigQuiet, TargetUID);
+ tr_SpawnShot(tgcShotType, wx, wy, dx, dy, not tgcQuiet, TargetUID);
end
else
begin
- if (trigData.trigReload > 0) and (ShotReloadTime = 0) then
+ if (tgcReload > 0) and (ShotReloadTime = 0) then
begin
- ShotReloadTime := trigData.trigReload; // òèêîâ íà ïåðåçàðÿäêó ïóøêè
+ ShotReloadTime := tgcReload; // òèêîâ íà ïåðåçàðÿäêó ïóøêè
end;
end;
end;
with Trigger do
begin
if TriggerType <> TRIGGER_SHOT then Exit;
- result := (trigData.trigAim and TRIGGER_SHOT_AIM_ALLMAP > 0)
+ result := (tgcAim and TRIGGER_SHOT_AIM_ALLMAP > 0)
or g_Obj_Collide(X, Y, Width, Height, Obj);
- if result and (trigData.trigAim and TRIGGER_SHOT_AIM_TRACE > 0) then
+ if result and (tgcAim and TRIGGER_SHOT_AIM_TRACE > 0) then
begin
- result := g_TraceVector(trigData.trigTX, trigData.trigTY,
+ result := g_TraceVector(tgcTX, tgcTY,
Obj^.X + Obj^.Rect.X + (Obj^.Rect.Width div 2),
Obj^.Y + Obj^.Rect.Y + (Obj^.Rect.Height div 2));
end;
g_Sound_PlayEx('SOUND_GAME_SWITCH0');
if g_Game_IsNet then MH_SEND_Sound(X, Y, 'SOUND_GAME_SWITCH0');
gExitByTrigger := True;
- g_Game_ExitLevel(trigData.trigMap);
+ g_Game_ExitLevel(tgcMap);
TimeOut := 18;
Result := True;
TRIGGER_TELEPORT:
begin
Result := tr_Teleport(ActivateUID,
- trigData.trigTarget.X, trigData.trigTarget.Y,
- trigData.trigDirection, trigData.trigSilent,
- trigData.trigD2d);
+ tgcTarget.X, tgcTarget.Y,
+ tgcDirection, tgcSilent,
+ tgcD2d);
TimeOut := 0;
end;
TRIGGER_OPENDOOR:
begin
- Result := tr_OpenDoor(trigPanelGUID, trigData.trigSilent, trigData.trigD2d);
+ Result := tr_OpenDoor(trigPanelGUID, tgcSilent, tgcD2d);
TimeOut := 0;
end;
TRIGGER_CLOSEDOOR:
begin
- Result := tr_CloseDoor(trigPanelGUID, trigData.trigSilent, trigData.trigD2d);
+ Result := tr_CloseDoor(trigPanelGUID, tgcSilent, tgcD2d);
TimeOut := 0;
end;
begin
if gWalls[{trigPanelID}pan.arrIdx].Enabled then
begin
- result := tr_OpenDoor(trigPanelGUID, trigData.trigSilent, trigData.trigD2d);
+ result := tr_OpenDoor(trigPanelGUID, tgcSilent, tgcD2d);
if (TriggerType = TRIGGER_DOOR5) then DoorTime := 180;
end
else
begin
- result := tr_CloseDoor(trigPanelGUID, trigData.trigSilent, trigData.trigD2d);
+ result := tr_CloseDoor(trigPanelGUID, tgcSilent, tgcD2d);
end;
if result then TimeOut := 18;
TRIGGER_CLOSETRAP, TRIGGER_TRAP:
begin
- tr_CloseTrap(trigPanelGUID, trigData.trigSilent, trigData.trigD2d);
+ tr_CloseTrap(trigPanelGUID, tgcSilent, tgcD2d);
if TriggerType = TRIGGER_TRAP then
begin
TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF:
begin
PressCount += 1;
- if PressTime = -1 then PressTime := trigData.trigWait;
+ if PressTime = -1 then PressTime := tgcWait;
if coolDown then TimeOut := 18 else TimeOut := 0;
Result := True;
end;
TRIGGER_LIFTUP:
begin
- Result := tr_SetLift(trigPanelGUID, 0, trigData.trigSilent, trigData.trigD2d);
+ Result := tr_SetLift(trigPanelGUID, 0, tgcSilent, tgcD2d);
TimeOut := 0;
- if (not trigData.trigSilent) and Result then begin
+ if (not tgcSilent) and Result then begin
g_Sound_PlayExAt('SOUND_GAME_SWITCH0',
X + (Width div 2),
Y + (Height div 2));
TRIGGER_LIFTDOWN:
begin
- Result := tr_SetLift(trigPanelGUID, 1, trigData.trigSilent, trigData.trigD2d);
+ Result := tr_SetLift(trigPanelGUID, 1, tgcSilent, tgcD2d);
TimeOut := 0;
- if (not trigData.trigSilent) and Result then begin
+ if (not tgcSilent) and Result then begin
g_Sound_PlayExAt('SOUND_GAME_SWITCH0',
X + (Width div 2),
Y + (Height div 2));
TRIGGER_LIFT:
begin
- Result := tr_SetLift(trigPanelGUID, 3, trigData.trigSilent, trigData.trigD2d);
+ Result := tr_SetLift(trigPanelGUID, 3, tgcSilent, tgcD2d);
if Result then
begin
TimeOut := 18;
- if (not trigData.trigSilent) and Result then begin
+ if (not tgcSilent) and Result then begin
g_Sound_PlayExAt('SOUND_GAME_SWITCH0',
X + (Width div 2),
Y + (Height div 2));
TRIGGER_TEXTURE:
begin
- if trigData.trigActivateOnce then
+ if tgcActivateOnce then
begin
Enabled := False;
TriggerType := TRIGGER_NONE;
else
TimeOut := 0;
- animonce := trigData.trigAnimateOnce;
+ animonce := tgcAnimateOnce;
Result := True;
end;
begin
if Sound <> nil then
begin
- if trigData.trigSoundSwitch and Sound.IsPlaying() then
+ if tgcSoundSwitch and Sound.IsPlaying() then
begin // Íóæíî âûêëþ÷èòü, åñëè èãðàë
Sound.Stop();
SoundPlayCount := 0;
Result := True;
end
else // (not Data.SoundSwitch) or (not Sound.IsPlaying())
- if (trigData.trigPlayCount > 0) or (not Sound.IsPlaying()) then
+ if (tgcPlayCount > 0) or (not Sound.IsPlaying()) then
begin
- if trigData.trigPlayCount > 0 then
- SoundPlayCount := trigData.trigPlayCount
+ if tgcPlayCount > 0 then
+ SoundPlayCount := tgcPlayCount
else // 0 - èãðàåì áåñêîíå÷íî
SoundPlayCount := 1;
Result := True;
end;
TRIGGER_SPAWNMONSTER:
- if (trigData.trigSpawnMonsType in [MONSTER_DEMON..MONSTER_MAN]) then
+ if (tgcSpawnMonsType in [MONSTER_DEMON..MONSTER_MAN]) then
begin
Result := False;
- if (trigData.trigDelay > 0) and (actType <> ACTIVATE_CUSTOM) then
+ if (tgcDelay > 0) and (actType <> ACTIVATE_CUSTOM) then
begin
AutoSpawn := not AutoSpawn;
SpawnCooldown := 0;
Result := True;
end;
- if ((trigData.trigDelay = 0) and (actType <> ACTIVATE_CUSTOM))
- or ((trigData.trigDelay > 0) and (actType = ACTIVATE_CUSTOM)) then
- for k := 1 to trigData.trigMonsCount do
+ if ((tgcDelay = 0) and (actType <> ACTIVATE_CUSTOM))
+ or ((tgcDelay > 0) and (actType = ACTIVATE_CUSTOM)) then
+ for k := 1 to tgcMonsCount do
begin
- if (actType = ACTIVATE_CUSTOM) and (trigData.trigDelay > 0) then
- SpawnCooldown := trigData.trigDelay;
- if (trigData.trigMax > 0) and (SpawnedCount >= trigData.trigMax) then
+ if (actType = ACTIVATE_CUSTOM) and (tgcDelay > 0) then
+ SpawnCooldown := tgcDelay;
+ if (tgcMax > 0) and (SpawnedCount >= tgcMax) then
Break;
- mon := g_Monsters_Create(trigData.trigSpawnMonsType,
- trigData.trigTX, trigData.trigTY,
- TDirection(trigData.trigDirection), True);
+ mon := g_Monsters_Create(tgcSpawnMonsType,
+ tgcTX, tgcTY,
+ TDirection(tgcDirection), True);
Result := True;
// Çäîðîâüå:
- if (trigData.trigHealth > 0) then
- mon.SetHealth(trigData.trigHealth);
+ if (tgcHealth > 0) then
+ mon.SetHealth(tgcHealth);
// Óñòàíàâëèâàåì ïîâåäåíèå:
- mon.MonsterBehaviour := trigData.trigBehaviour;
+ mon.MonsterBehaviour := tgcBehaviour;
mon.FNoRespawn := True;
if g_Game_IsNet then
MH_SEND_MonsterSpawn(mon.UID);
// Èäåì èñêàòü öåëü, åñëè íàäî:
- if trigData.trigActive then
+ if tgcActive then
mon.WakeUp();
- if trigData.trigSpawnMonsType <> MONSTER_BARREL then Inc(gTotalMonsters);
+ if tgcSpawnMonsType <> MONSTER_BARREL then Inc(gTotalMonsters);
if g_Game_IsNet then
begin
gMonstersSpawned[High(gMonstersSpawned)] := mon.UID;
end;
- if trigData.trigMax > 0 then
+ if tgcMax > 0 then
begin
mon.SpawnTrigger := ID;
Inc(SpawnedCount);
end;
- case trigData.trigEffect of
+ case tgcEffect of
EFFECT_TELEPORT: begin
if g_Frames_Get(FramesID, 'FRAMES_TELEPORT') then
begin
Anim := TAnimation.Create(FramesID, False, 3);
- g_Sound_PlayExAt('SOUND_GAME_TELEPORT', trigData.trigTX, trigData.trigTY);
+ g_Sound_PlayExAt('SOUND_GAME_TELEPORT', tgcTX, tgcTY);
g_GFX_OnceAnim(mon.Obj.X+mon.Obj.Rect.X+(mon.Obj.Rect.Width div 2)-32,
mon.Obj.Y+mon.Obj.Rect.Y+(mon.Obj.Rect.Height div 2)-32, Anim);
Anim.Free();
if g_Frames_Get(FramesID, 'FRAMES_ITEM_RESPAWN') then
begin
Anim := TAnimation.Create(FramesID, False, 4);
- g_Sound_PlayExAt('SOUND_ITEM_RESPAWNITEM', trigData.trigTX, trigData.trigTY);
+ g_Sound_PlayExAt('SOUND_ITEM_RESPAWNITEM', tgcTX, tgcTY);
g_GFX_OnceAnim(mon.Obj.X+mon.Obj.Rect.X+(mon.Obj.Rect.Width div 2)-16,
mon.Obj.Y+mon.Obj.Rect.Y+(mon.Obj.Rect.Height div 2)-16, Anim);
Anim.Free();
if g_Frames_Get(FramesID, 'FRAMES_FIRE') then
begin
Anim := TAnimation.Create(FramesID, False, 4);
- g_Sound_PlayExAt('SOUND_FIRE', trigData.trigTX, trigData.trigTY);
+ g_Sound_PlayExAt('SOUND_FIRE', tgcTX, tgcTY);
g_GFX_OnceAnim(mon.Obj.X+mon.Obj.Rect.X+(mon.Obj.Rect.Width div 2)-32,
mon.Obj.Y+mon.Obj.Rect.Y+mon.Obj.Rect.Height-128, Anim);
Anim.Free();
end;
TRIGGER_SPAWNITEM:
- if (trigData.trigSpawnItemType in [ITEM_MEDKIT_SMALL..ITEM_MAX]) then
+ if (tgcSpawnItemType in [ITEM_MEDKIT_SMALL..ITEM_MAX]) then
begin
Result := False;
- if (trigData.trigDelay > 0) and (actType <> ACTIVATE_CUSTOM) then
+ if (tgcDelay > 0) and (actType <> ACTIVATE_CUSTOM) then
begin
AutoSpawn := not AutoSpawn;
SpawnCooldown := 0;
Result := True;
end;
- if ((trigData.trigDelay = 0) and (actType <> ACTIVATE_CUSTOM))
- or ((trigData.trigDelay > 0) and (actType = ACTIVATE_CUSTOM)) then
- if (not trigData.trigDmonly) or
+ if ((tgcDelay = 0) and (actType <> ACTIVATE_CUSTOM))
+ or ((tgcDelay > 0) and (actType = ACTIVATE_CUSTOM)) then
+ if (not tgcDmonly) or
(gGameSettings.GameMode in [GM_DM, GM_TDM, GM_CTF]) then
- for k := 1 to trigData.trigItemCount do
+ for k := 1 to tgcItemCount do
begin
- if (actType = ACTIVATE_CUSTOM) and (trigData.trigDelay > 0) then
- SpawnCooldown := trigData.trigDelay;
- if (trigData.trigMax > 0) and (SpawnedCount >= trigData.trigMax) then
+ if (actType = ACTIVATE_CUSTOM) and (tgcDelay > 0) then
+ SpawnCooldown := tgcDelay;
+ if (tgcMax > 0) and (SpawnedCount >= tgcMax) then
Break;
- iid := g_Items_Create(trigData.trigTX, trigData.trigTY,
- trigData.trigSpawnItemType, trigData.trigGravity, False, True);
+ iid := g_Items_Create(tgcTX, tgcTY,
+ tgcSpawnItemType, tgcGravity, False, True);
Result := True;
- if trigData.trigMax > 0 then
+ if tgcMax > 0 then
begin
it := g_Items_ByIdx(iid);
it.SpawnTrigger := ID;
Inc(SpawnedCount);
end;
- case trigData.trigEffect of
+ case tgcEffect of
EFFECT_TELEPORT: begin
it := g_Items_ByIdx(iid);
if g_Frames_Get(FramesID, 'FRAMES_TELEPORT') then
begin
Anim := TAnimation.Create(FramesID, False, 3);
- g_Sound_PlayExAt('SOUND_GAME_TELEPORT', trigData.trigTX, trigData.trigTY);
+ g_Sound_PlayExAt('SOUND_GAME_TELEPORT', tgcTX, tgcTY);
g_GFX_OnceAnim(it.Obj.X+it.Obj.Rect.X+(it.Obj.Rect.Width div 2)-32,
it.Obj.Y+it.Obj.Rect.Y+(it.Obj.Rect.Height div 2)-32, Anim);
Anim.Free();
if g_Frames_Get(FramesID, 'FRAMES_ITEM_RESPAWN') then
begin
Anim := TAnimation.Create(FramesID, False, 4);
- g_Sound_PlayExAt('SOUND_ITEM_RESPAWNITEM', trigData.trigTX, trigData.trigTY);
+ g_Sound_PlayExAt('SOUND_ITEM_RESPAWNITEM', tgcTX, tgcTY);
g_GFX_OnceAnim(it.Obj.X+it.Obj.Rect.X+(it.Obj.Rect.Width div 2)-16,
it.Obj.Y+it.Obj.Rect.Y+(it.Obj.Rect.Height div 2)-16, Anim);
Anim.Free();
if g_Frames_Get(FramesID, 'FRAMES_FIRE') then
begin
Anim := TAnimation.Create(FramesID, False, 4);
- g_Sound_PlayExAt('SOUND_FIRE', trigData.trigTX, trigData.trigTY);
+ g_Sound_PlayExAt('SOUND_FIRE', tgcTX, tgcTY);
g_GFX_OnceAnim(it.Obj.X+it.Obj.Rect.X+(it.Obj.Rect.Width div 2)-32,
it.Obj.Y+it.Obj.Rect.Y+it.Obj.Rect.Height-128, Anim);
Anim.Free();
TRIGGER_MUSIC:
begin
// Ìåíÿåì ìóçûêó, åñëè åñòü íà ÷òî:
- if (Trigger.trigData.trigMusicName <> '') then
+ if (Trigger.tgcMusicName <> '') then
begin
- gMusic.SetByName(Trigger.trigData.trigMusicName);
+ gMusic.SetByName(Trigger.tgcMusicName);
gMusic.SpecPause := True;
gMusic.Play();
end;
- case Trigger.trigData.trigMusicAction of
+ case Trigger.tgcMusicAction of
TRIGGER_MUSIC_ACTION_STOP: // Âûêëþ÷èòü
gMusic.SpecPause := True; // Ïàóçà
TRIGGER_MUSIC_ACTION_PLAY: // Âêëþ÷èòü
TRIGGER_PUSH:
begin
- pAngle := -DegToRad(trigData.trigAngle);
+ pAngle := -DegToRad(tgcAngle);
Result := tr_Push(ActivateUID,
- Floor(Cos(pAngle)*trigData.trigForce),
- Floor(Sin(pAngle)*trigData.trigForce),
- trigData.trigResetVelocity);
+ Floor(Cos(pAngle)*tgcForce),
+ Floor(Sin(pAngle)*tgcForce),
+ tgcResetVelocity);
TimeOut := 0;
end;
begin
Result := False;
// Ïðèáàâèòü èëè îòíÿòü î÷êî
- if (trigData.trigScoreAction in [TRIGGER_SCORE_ACTION_ADD, TRIGGER_SCORE_ACTION_SUB]) and (trigData.trigScoreCount > 0) then
+ if (tgcScoreAction in [TRIGGER_SCORE_ACTION_ADD, TRIGGER_SCORE_ACTION_SUB]) and (tgcScoreCount > 0) then
begin
// Ñâîåé èëè ÷óæîé êîìàíäå
- if (trigData.trigScoreTeam in [TRIGGER_SCORE_TEAM_MINE_RED, TRIGGER_SCORE_TEAM_MINE_BLUE]) and (g_GetUIDType(ActivateUID) = UID_PLAYER) then
+ if (tgcScoreTeam in [TRIGGER_SCORE_TEAM_MINE_RED, TRIGGER_SCORE_TEAM_MINE_BLUE]) and (g_GetUIDType(ActivateUID) = UID_PLAYER) then
begin
p := g_Player_Get(ActivateUID);
- if ((trigData.trigScoreAction = TRIGGER_SCORE_ACTION_ADD) and (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_RED))
- or ((trigData.trigScoreAction = TRIGGER_SCORE_ACTION_ADD) and (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_BLUE)) then
+ if ((tgcScoreAction = TRIGGER_SCORE_ACTION_ADD) and (tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_RED))
+ or ((tgcScoreAction = TRIGGER_SCORE_ACTION_ADD) and (tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_BLUE)) then
begin
- Inc(gTeamStat[TEAM_RED].Goals, trigData.trigScoreCount); // Red Scores
+ Inc(gTeamStat[TEAM_RED].Goals, tgcScoreCount); // Red Scores
- if trigData.trigScoreCon then
+ if tgcScoreCon then
begin
- if (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) then
+ if (tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) then
begin
- g_Console_Add(Format(_lc[I_PLAYER_SCORE_ADD_OWN], [p.Name, trigData.trigScoreCount, _lc[I_PLAYER_SCORE_TO_RED]]), True);
+ g_Console_Add(Format(_lc[I_PLAYER_SCORE_ADD_OWN], [p.Name, tgcScoreCount, _lc[I_PLAYER_SCORE_TO_RED]]), True);
if g_Game_IsServer and g_Game_IsNet then
- MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (trigData.trigScoreCount shl 16), '+r');
+ MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (tgcScoreCount shl 16), '+r');
end else
begin
- g_Console_Add(Format(_lc[I_PLAYER_SCORE_ADD_ENEMY], [p.Name, trigData.trigScoreCount, _lc[I_PLAYER_SCORE_TO_RED]]), True);
+ g_Console_Add(Format(_lc[I_PLAYER_SCORE_ADD_ENEMY], [p.Name, tgcScoreCount, _lc[I_PLAYER_SCORE_TO_RED]]), True);
if g_Game_IsServer and g_Game_IsNet then
- MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (trigData.trigScoreCount shl 16), '+re');
+ MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (tgcScoreCount shl 16), '+re');
end;
end;
- if trigData.trigScoreMsg then
+ if tgcScoreMsg then
begin
g_Game_Message(Format(_lc[I_MESSAGE_SCORE_ADD], [AnsiUpperCase(_lc[I_GAME_TEAM_RED])]), 108);
if g_Game_IsServer and g_Game_IsNet then
MH_SEND_GameEvent(NET_EV_SCORE_MSG, TEAM_RED);
end;
end;
- if ((trigData.trigScoreAction = TRIGGER_SCORE_ACTION_SUB) and (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_RED))
- or ((trigData.trigScoreAction = TRIGGER_SCORE_ACTION_SUB) and (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_BLUE)) then
+ if ((tgcScoreAction = TRIGGER_SCORE_ACTION_SUB) and (tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_RED))
+ or ((tgcScoreAction = TRIGGER_SCORE_ACTION_SUB) and (tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_BLUE)) then
begin
- Dec(gTeamStat[TEAM_RED].Goals, trigData.trigScoreCount); // Red Fouls
+ Dec(gTeamStat[TEAM_RED].Goals, tgcScoreCount); // Red Fouls
- if trigData.trigScoreCon then
+ if tgcScoreCon then
begin
- if (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) then
+ if (tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) then
begin
- g_Console_Add(Format(_lc[I_PLAYER_SCORE_SUB_OWN], [p.Name, trigData.trigScoreCount, _lc[I_PLAYER_SCORE_TO_RED]]), True);
+ g_Console_Add(Format(_lc[I_PLAYER_SCORE_SUB_OWN], [p.Name, tgcScoreCount, _lc[I_PLAYER_SCORE_TO_RED]]), True);
if g_Game_IsServer and g_Game_IsNet then
- MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (trigData.trigScoreCount shl 16), '-r');
+ MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (tgcScoreCount shl 16), '-r');
end else
begin
- g_Console_Add(Format(_lc[I_PLAYER_SCORE_SUB_ENEMY], [p.Name, trigData.trigScoreCount, _lc[I_PLAYER_SCORE_TO_RED]]), True);
+ g_Console_Add(Format(_lc[I_PLAYER_SCORE_SUB_ENEMY], [p.Name, tgcScoreCount, _lc[I_PLAYER_SCORE_TO_RED]]), True);
if g_Game_IsServer and g_Game_IsNet then
- MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (trigData.trigScoreCount shl 16), '-re');
+ MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (tgcScoreCount shl 16), '-re');
end;
end;
- if trigData.trigScoreMsg then
+ if tgcScoreMsg then
begin
g_Game_Message(Format(_lc[I_MESSAGE_SCORE_SUB], [AnsiUpperCase(_lc[I_GAME_TEAM_RED])]), 108);
if g_Game_IsServer and g_Game_IsNet then
MH_SEND_GameEvent(NET_EV_SCORE_MSG, -TEAM_RED);
end;
end;
- if ((trigData.trigScoreAction = TRIGGER_SCORE_ACTION_ADD) and (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_BLUE))
- or ((trigData.trigScoreAction = TRIGGER_SCORE_ACTION_ADD) and (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_RED)) then
+ if ((tgcScoreAction = TRIGGER_SCORE_ACTION_ADD) and (tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_BLUE))
+ or ((tgcScoreAction = TRIGGER_SCORE_ACTION_ADD) and (tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_RED)) then
begin
- Inc(gTeamStat[TEAM_BLUE].Goals, trigData.trigScoreCount); // Blue Scores
+ Inc(gTeamStat[TEAM_BLUE].Goals, tgcScoreCount); // Blue Scores
- if trigData.trigScoreCon then
+ if tgcScoreCon then
begin
- if (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) then
+ if (tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) then
begin
- g_Console_Add(Format(_lc[I_PLAYER_SCORE_ADD_OWN], [p.Name, trigData.trigScoreCount, _lc[I_PLAYER_SCORE_TO_BLUE]]), True);
+ g_Console_Add(Format(_lc[I_PLAYER_SCORE_ADD_OWN], [p.Name, tgcScoreCount, _lc[I_PLAYER_SCORE_TO_BLUE]]), True);
if g_Game_IsServer and g_Game_IsNet then
- MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (trigData.trigScoreCount shl 16), '+b');
+ MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (tgcScoreCount shl 16), '+b');
end else
begin
- g_Console_Add(Format(_lc[I_PLAYER_SCORE_ADD_ENEMY], [p.Name, trigData.trigScoreCount, _lc[I_PLAYER_SCORE_TO_BLUE]]), True);
+ g_Console_Add(Format(_lc[I_PLAYER_SCORE_ADD_ENEMY], [p.Name, tgcScoreCount, _lc[I_PLAYER_SCORE_TO_BLUE]]), True);
if g_Game_IsServer and g_Game_IsNet then
- MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (trigData.trigScoreCount shl 16), '+be');
+ MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (tgcScoreCount shl 16), '+be');
end;
end;
- if trigData.trigScoreMsg then
+ if tgcScoreMsg then
begin
g_Game_Message(Format(_lc[I_MESSAGE_SCORE_ADD], [AnsiUpperCase(_lc[I_GAME_TEAM_BLUE])]), 108);
if g_Game_IsServer and g_Game_IsNet then
MH_SEND_GameEvent(NET_EV_SCORE_MSG, TEAM_BLUE);
end;
end;
- if ((trigData.trigScoreAction = TRIGGER_SCORE_ACTION_SUB) and (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_BLUE))
- or ((trigData.trigScoreAction = TRIGGER_SCORE_ACTION_SUB) and (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_RED)) then
+ if ((tgcScoreAction = TRIGGER_SCORE_ACTION_SUB) and (tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_BLUE))
+ or ((tgcScoreAction = TRIGGER_SCORE_ACTION_SUB) and (tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_RED)) then
begin
- Dec(gTeamStat[TEAM_BLUE].Goals, trigData.trigScoreCount); // Blue Fouls
+ Dec(gTeamStat[TEAM_BLUE].Goals, tgcScoreCount); // Blue Fouls
- if trigData.trigScoreCon then
+ if tgcScoreCon then
begin
- if (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) then
+ if (tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) then
begin
- g_Console_Add(Format(_lc[I_PLAYER_SCORE_SUB_OWN], [p.Name, trigData.trigScoreCount, _lc[I_PLAYER_SCORE_TO_BLUE]]), True);
+ g_Console_Add(Format(_lc[I_PLAYER_SCORE_SUB_OWN], [p.Name, tgcScoreCount, _lc[I_PLAYER_SCORE_TO_BLUE]]), True);
if g_Game_IsServer and g_Game_IsNet then
- MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (trigData.trigScoreCount shl 16), '-b');
+ MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (tgcScoreCount shl 16), '-b');
end else
begin
- g_Console_Add(Format(_lc[I_PLAYER_SCORE_SUB_ENEMY], [p.Name, trigData.trigScoreCount, _lc[I_PLAYER_SCORE_TO_BLUE]]), True);
+ g_Console_Add(Format(_lc[I_PLAYER_SCORE_SUB_ENEMY], [p.Name, tgcScoreCount, _lc[I_PLAYER_SCORE_TO_BLUE]]), True);
if g_Game_IsServer and g_Game_IsNet then
- MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (trigData.trigScoreCount shl 16), '-be');
+ MH_SEND_GameEvent(NET_EV_SCORE, p.UID or (tgcScoreCount shl 16), '-be');
end;
end;
- if trigData.trigScoreMsg then
+ if tgcScoreMsg then
begin
g_Game_Message(Format(_lc[I_MESSAGE_SCORE_SUB], [AnsiUpperCase(_lc[I_GAME_TEAM_BLUE])]), 108);
if g_Game_IsServer and g_Game_IsNet then
Result := (p.Team = TEAM_RED) or (p.Team = TEAM_BLUE);
end;
// Êàêîé-òî êîíêðåòíîé êîìàíäå
- if trigData.trigScoreTeam in [TRIGGER_SCORE_TEAM_FORCE_RED, TRIGGER_SCORE_TEAM_FORCE_BLUE] then
+ if tgcScoreTeam in [TRIGGER_SCORE_TEAM_FORCE_RED, TRIGGER_SCORE_TEAM_FORCE_BLUE] then
begin
- if (trigData.trigScoreAction = TRIGGER_SCORE_ACTION_ADD) and (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_FORCE_RED) then
+ if (tgcScoreAction = TRIGGER_SCORE_ACTION_ADD) and (tgcScoreTeam = TRIGGER_SCORE_TEAM_FORCE_RED) then
begin
- Inc(gTeamStat[TEAM_RED].Goals, trigData.trigScoreCount); // Red Scores
+ Inc(gTeamStat[TEAM_RED].Goals, tgcScoreCount); // Red Scores
- if trigData.trigScoreCon then
+ if tgcScoreCon then
begin
- g_Console_Add(Format(_lc[I_PLAYER_SCORE_ADD_TEAM], [_lc[I_PLAYER_SCORE_RED], trigData.trigScoreCount]), True);
+ g_Console_Add(Format(_lc[I_PLAYER_SCORE_ADD_TEAM], [_lc[I_PLAYER_SCORE_RED], tgcScoreCount]), True);
if g_Game_IsServer and g_Game_IsNet then
- MH_SEND_GameEvent(NET_EV_SCORE, trigData.trigScoreCount shl 16, '+tr');
+ MH_SEND_GameEvent(NET_EV_SCORE, tgcScoreCount shl 16, '+tr');
end;
- if trigData.trigScoreMsg then
+ if tgcScoreMsg then
begin
g_Game_Message(Format(_lc[I_MESSAGE_SCORE_ADD], [AnsiUpperCase(_lc[I_GAME_TEAM_RED])]), 108);
if g_Game_IsServer and g_Game_IsNet then
MH_SEND_GameEvent(NET_EV_SCORE_MSG, TEAM_RED);
end;
end;
- if (trigData.trigScoreAction = TRIGGER_SCORE_ACTION_SUB) and (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_FORCE_RED) then
+ if (tgcScoreAction = TRIGGER_SCORE_ACTION_SUB) and (tgcScoreTeam = TRIGGER_SCORE_TEAM_FORCE_RED) then
begin
- Dec(gTeamStat[TEAM_RED].Goals, trigData.trigScoreCount); // Red Fouls
+ Dec(gTeamStat[TEAM_RED].Goals, tgcScoreCount); // Red Fouls
- if trigData.trigScoreCon then
+ if tgcScoreCon then
begin
- g_Console_Add(Format(_lc[I_PLAYER_SCORE_SUB_TEAM], [_lc[I_PLAYER_SCORE_RED], trigData.trigScoreCount]), True);
+ g_Console_Add(Format(_lc[I_PLAYER_SCORE_SUB_TEAM], [_lc[I_PLAYER_SCORE_RED], tgcScoreCount]), True);
if g_Game_IsServer and g_Game_IsNet then
- MH_SEND_GameEvent(NET_EV_SCORE, trigData.trigScoreCount shl 16, '-tr');
+ MH_SEND_GameEvent(NET_EV_SCORE, tgcScoreCount shl 16, '-tr');
end;
- if trigData.trigScoreMsg then
+ if tgcScoreMsg then
begin
g_Game_Message(Format(_lc[I_MESSAGE_SCORE_SUB], [AnsiUpperCase(_lc[I_GAME_TEAM_RED])]), 108);
if g_Game_IsServer and g_Game_IsNet then
MH_SEND_GameEvent(NET_EV_SCORE_MSG, -TEAM_RED);
end;
end;
- if (trigData.trigScoreAction = TRIGGER_SCORE_ACTION_ADD) and (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_FORCE_BLUE) then
+ if (tgcScoreAction = TRIGGER_SCORE_ACTION_ADD) and (tgcScoreTeam = TRIGGER_SCORE_TEAM_FORCE_BLUE) then
begin
- Inc(gTeamStat[TEAM_BLUE].Goals, trigData.trigScoreCount); // Blue Scores
+ Inc(gTeamStat[TEAM_BLUE].Goals, tgcScoreCount); // Blue Scores
- if trigData.trigScoreCon then
+ if tgcScoreCon then
begin
- g_Console_Add(Format(_lc[I_PLAYER_SCORE_ADD_TEAM], [_lc[I_PLAYER_SCORE_BLUE], trigData.trigScoreCount]), True);
+ g_Console_Add(Format(_lc[I_PLAYER_SCORE_ADD_TEAM], [_lc[I_PLAYER_SCORE_BLUE], tgcScoreCount]), True);
if g_Game_IsServer and g_Game_IsNet then
- MH_SEND_GameEvent(NET_EV_SCORE, trigData.trigScoreCount shl 16, '+tb');
+ MH_SEND_GameEvent(NET_EV_SCORE, tgcScoreCount shl 16, '+tb');
end;
- if trigData.trigScoreMsg then
+ if tgcScoreMsg then
begin
g_Game_Message(Format(_lc[I_MESSAGE_SCORE_ADD], [AnsiUpperCase(_lc[I_GAME_TEAM_BLUE])]), 108);
if g_Game_IsServer and g_Game_IsNet then
MH_SEND_GameEvent(NET_EV_SCORE_MSG, TEAM_BLUE);
end;
end;
- if (trigData.trigScoreAction = TRIGGER_SCORE_ACTION_SUB) and (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_FORCE_BLUE) then
+ if (tgcScoreAction = TRIGGER_SCORE_ACTION_SUB) and (tgcScoreTeam = TRIGGER_SCORE_TEAM_FORCE_BLUE) then
begin
- Dec(gTeamStat[TEAM_BLUE].Goals, trigData.trigScoreCount); // Blue Fouls
+ Dec(gTeamStat[TEAM_BLUE].Goals, tgcScoreCount); // Blue Fouls
- if trigData.trigScoreCon then
+ if tgcScoreCon then
begin
- g_Console_Add(Format(_lc[I_PLAYER_SCORE_SUB_TEAM], [_lc[I_PLAYER_SCORE_BLUE], trigData.trigScoreCount]), True);
+ g_Console_Add(Format(_lc[I_PLAYER_SCORE_SUB_TEAM], [_lc[I_PLAYER_SCORE_BLUE], tgcScoreCount]), True);
if g_Game_IsServer and g_Game_IsNet then
- MH_SEND_GameEvent(NET_EV_SCORE, trigData.trigScoreCount shl 16, '-tb');
+ MH_SEND_GameEvent(NET_EV_SCORE, tgcScoreCount shl 16, '-tb');
end;
- if trigData.trigScoreMsg then
+ if tgcScoreMsg then
begin
g_Game_Message(Format(_lc[I_MESSAGE_SCORE_SUB], [AnsiUpperCase(_lc[I_GAME_TEAM_BLUE])]), 108);
if g_Game_IsServer and g_Game_IsNet then
end;
end;
// Âûèãðûø
- if (trigData.trigScoreAction = TRIGGER_SCORE_ACTION_WIN) and (gGameSettings.GoalLimit > 0) then
+ if (tgcScoreAction = TRIGGER_SCORE_ACTION_WIN) and (gGameSettings.GoalLimit > 0) then
begin
// Ñâîåé èëè ÷óæîé êîìàíäû
- if (trigData.trigScoreTeam in [TRIGGER_SCORE_TEAM_MINE_RED, TRIGGER_SCORE_TEAM_MINE_BLUE]) and (g_GetUIDType(ActivateUID) = UID_PLAYER) then
+ if (tgcScoreTeam in [TRIGGER_SCORE_TEAM_MINE_RED, TRIGGER_SCORE_TEAM_MINE_BLUE]) and (g_GetUIDType(ActivateUID) = UID_PLAYER) then
begin
p := g_Player_Get(ActivateUID);
- if ((trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_RED)) // Red Wins
- or ((trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_BLUE)) then
+ if ((tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_RED)) // Red Wins
+ or ((tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_BLUE)) then
begin
if gTeamStat[TEAM_RED].Goals < SmallInt(gGameSettings.GoalLimit) then
begin
gTeamStat[TEAM_RED].Goals := gGameSettings.GoalLimit;
- if trigData.trigScoreCon then
+ if tgcScoreCon then
begin
- if (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) then
+ if (tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) then
begin
g_Console_Add(Format(_lc[I_PLAYER_SCORE_WIN_OWN], [p.Name, _lc[I_PLAYER_SCORE_TO_RED]]), True);
if g_Game_IsServer and g_Game_IsNet then
Result := True;
end;
end;
- if ((trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_BLUE)) // Blue Wins
- or ((trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_RED)) then
+ if ((tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_BLUE)) // Blue Wins
+ or ((tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_RED)) then
begin
if gTeamStat[TEAM_BLUE].Goals < SmallInt(gGameSettings.GoalLimit) then
begin
gTeamStat[TEAM_BLUE].Goals := gGameSettings.GoalLimit;
- if trigData.trigScoreCon then
+ if tgcScoreCon then
begin
- if (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) then
+ if (tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) then
begin
g_Console_Add(Format(_lc[I_PLAYER_SCORE_WIN_OWN], [p.Name, _lc[I_PLAYER_SCORE_TO_BLUE]]), True);
if g_Game_IsServer and g_Game_IsNet then
end;
end;
// Êàêîé-òî êîíêðåòíîé êîìàíäû
- if trigData.trigScoreTeam in [TRIGGER_SCORE_TEAM_FORCE_RED, TRIGGER_SCORE_TEAM_FORCE_BLUE] then
+ if tgcScoreTeam in [TRIGGER_SCORE_TEAM_FORCE_RED, TRIGGER_SCORE_TEAM_FORCE_BLUE] then
begin
- if (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_FORCE_RED) then // Red Wins
+ if (tgcScoreTeam = TRIGGER_SCORE_TEAM_FORCE_RED) then // Red Wins
begin
if gTeamStat[TEAM_RED].Goals < SmallInt(gGameSettings.GoalLimit) then
begin
Result := True;
end;
end;
- if (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_FORCE_BLUE) then // Blue Wins
+ if (tgcScoreTeam = TRIGGER_SCORE_TEAM_FORCE_BLUE) then // Blue Wins
begin
if gTeamStat[TEAM_BLUE].Goals < SmallInt(gGameSettings.GoalLimit) then
begin
end;
end;
// Ïðîèãðûø
- if (trigData.trigScoreAction = TRIGGER_SCORE_ACTION_LOOSE) and (gGameSettings.GoalLimit > 0) then
+ if (tgcScoreAction = TRIGGER_SCORE_ACTION_LOOSE) and (gGameSettings.GoalLimit > 0) then
begin
// Ñâîåé èëè ÷óæîé êîìàíäû
- if (trigData.trigScoreTeam in [TRIGGER_SCORE_TEAM_MINE_RED, TRIGGER_SCORE_TEAM_MINE_BLUE]) and (g_GetUIDType(ActivateUID) = UID_PLAYER) then
+ if (tgcScoreTeam in [TRIGGER_SCORE_TEAM_MINE_RED, TRIGGER_SCORE_TEAM_MINE_BLUE]) and (g_GetUIDType(ActivateUID) = UID_PLAYER) then
begin
p := g_Player_Get(ActivateUID);
- if ((trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_BLUE)) // Red Wins
- or ((trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_RED)) then
+ if ((tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_BLUE)) // Red Wins
+ or ((tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_RED)) then
if gTeamStat[TEAM_RED].Goals < SmallInt(gGameSettings.GoalLimit) then
begin
gTeamStat[TEAM_RED].Goals := gGameSettings.GoalLimit;
- if trigData.trigScoreCon then
- if trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED then
+ if tgcScoreCon then
+ if tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED then
begin
g_Console_Add(Format(_lc[I_PLAYER_SCORE_WIN_ENEMY], [p.Name, _lc[I_PLAYER_SCORE_TO_RED]]), True);
if g_Game_IsServer and g_Game_IsNet then
Result := True;
end;
- if ((trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_RED)) // Blue Wins
- or ((trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_BLUE)) then
+ if ((tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED) and (p.Team = TEAM_RED)) // Blue Wins
+ or ((tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_BLUE) and (p.Team = TEAM_BLUE)) then
if gTeamStat[TEAM_BLUE].Goals < SmallInt(gGameSettings.GoalLimit) then
begin
gTeamStat[TEAM_BLUE].Goals := gGameSettings.GoalLimit;
- if trigData.trigScoreCon then
- if trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED then
+ if tgcScoreCon then
+ if tgcScoreTeam = TRIGGER_SCORE_TEAM_MINE_RED then
begin
g_Console_Add(Format(_lc[I_PLAYER_SCORE_WIN_ENEMY], [p.Name, _lc[I_PLAYER_SCORE_TO_BLUE]]), True);
if g_Game_IsServer and g_Game_IsNet then
end;
end;
// Êàêîé-òî êîíêðåòíîé êîìàíäû
- if trigData.trigScoreTeam in [TRIGGER_SCORE_TEAM_FORCE_BLUE, TRIGGER_SCORE_TEAM_FORCE_RED] then
+ if tgcScoreTeam in [TRIGGER_SCORE_TEAM_FORCE_BLUE, TRIGGER_SCORE_TEAM_FORCE_RED] then
begin
- if (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_FORCE_BLUE) then // Red Wins
+ if (tgcScoreTeam = TRIGGER_SCORE_TEAM_FORCE_BLUE) then // Red Wins
begin
if gTeamStat[TEAM_RED].Goals < SmallInt(gGameSettings.GoalLimit) then
begin
Result := True;
end;
end;
- if (trigData.trigScoreTeam = TRIGGER_SCORE_TEAM_FORCE_RED) then // Blue Wins
+ if (tgcScoreTeam = TRIGGER_SCORE_TEAM_FORCE_RED) then // Blue Wins
begin
if gTeamStat[TEAM_BLUE].Goals < SmallInt(gGameSettings.GoalLimit) then
begin
TRIGGER_MESSAGE:
begin
- Result := tr_Message(trigData.trigKind, trigData.trigText,
- trigData.trigMsgDest, trigData.trigMsgTime,
+ Result := tr_Message(tgcKind, tgcText,
+ tgcMsgDest, tgcMsgTime,
ActivateUID);
TimeOut := 18;
end;
end else
begin // Óæå âèäåëè åãî
// Åñëè èíòåðâàë îòêëþ÷¸í, íî îí âñ¸ åù¸ â çîíå ïîðàæåíèÿ, äà¸ì åìó âðåìÿ
- if (trigData.trigInterval = 0) and (Activators[k].TimeOut > 0) then
+ if (tgcInterval = 0) and (Activators[k].TimeOut > 0) then
Activators[k].TimeOut := 65535;
// Òàéìàóò ïðîø¸ë - ðàáîòàåì
Result := Activators[k].TimeOut = 0;
Exit;
// Íàíîñèì óðîí èãðîêó
- if (TriggerType = TRIGGER_DAMAGE) and (trigData.trigAmount > 0) then
- p.Damage(trigData.trigAmount, 0, 0, 0, HIT_SOME);
+ if (TriggerType = TRIGGER_DAMAGE) and (tgcAmount > 0) then
+ p.Damage(tgcAmount, 0, 0, 0, HIT_SOME);
// Ëå÷èì èãðîêà
- if (TriggerType = TRIGGER_HEALTH) and (trigData.trigAmount > 0) then
- if p.Heal(trigData.trigAmount, not trigData.trigHealMax) and (not trigData.trigSilent) then
+ if (TriggerType = TRIGGER_HEALTH) and (tgcAmount > 0) then
+ if p.Heal(tgcAmount, not tgcHealMax) and (not tgcSilent) then
begin
g_Sound_PlayExAt('SOUND_ITEM_GETITEM', p.Obj.X, p.Obj.Y);
if g_Game_IsServer and g_Game_IsNet then
Exit;
// Íàíîñèì óðîí ìîíñòðó
- if (TriggerType = TRIGGER_DAMAGE) and (trigData.trigAmount > 0) then
- m.Damage(trigData.trigAmount, 0, 0, 0, HIT_SOME);
+ if (TriggerType = TRIGGER_DAMAGE) and (tgcAmount > 0) then
+ m.Damage(tgcAmount, 0, 0, 0, HIT_SOME);
// Ëå÷èì ìîíñòðà
- if (TriggerType = TRIGGER_HEALTH) and (trigData.trigAmount > 0) then
- if m.Heal(trigData.trigAmount) and (not trigData.trigSilent) then
+ if (TriggerType = TRIGGER_HEALTH) and (tgcAmount > 0) then
+ if m.Heal(tgcAmount) and (not tgcSilent) then
begin
g_Sound_PlayExAt('SOUND_ITEM_GETITEM', m.Obj.X, m.Obj.Y);
if g_Game_IsServer and g_Game_IsNet then
end;
end;
// Íàçíà÷àåì âðåìÿ ñëåäóþùåãî âîçäåéñòâèÿ
- idx := trigData.trigInterval;
+ idx := tgcInterval;
if coolDown then
if idx > 0 then
Activators[k].TimeOut := idx
Exit;
// put this at the beginning so it doesn't trigger itself
- TimeOut := trigData.trigWait + 1;
+ TimeOut := tgcWait + 1;
- wx := trigData.trigTX;
- wy := trigData.trigTY;
- pAngle := -DegToRad(trigData.trigAngle);
+ wx := tgcTX;
+ wy := tgcTY;
+ pAngle := -DegToRad(tgcAngle);
xd := wx + Round(Cos(pAngle) * 32.0);
yd := wy + Round(Sin(pAngle) * 32.0);
TargetUID := 0;
- case trigData.trigShotTarget of
+ case tgcShotTarget of
TRIGGER_SHOT_TARGET_MON: // monsters
//TODO: accelerate this!
g_Mons_ForEachAlive(monsShotTarget);
end;
else begin
- if (trigData.trigShotTarget <> TRIGGER_SHOT_TARGET_NONE) or
- (trigData.trigShotType <> TRIGGER_SHOT_REV) then
+ if (tgcShotTarget <> TRIGGER_SHOT_TARGET_NONE) or
+ (tgcShotType <> TRIGGER_SHOT_REV) then
TargetUID := ActivateUID;
end;
end;
- if (trigData.trigShotTarget = TRIGGER_SHOT_TARGET_NONE) or (TargetUID > 0) or
- ((trigData.trigShotTarget > TRIGGER_SHOT_TARGET_NONE) and (TargetUID = 0)) then
+ if (tgcShotTarget = TRIGGER_SHOT_TARGET_NONE) or (TargetUID > 0) or
+ ((tgcShotTarget > TRIGGER_SHOT_TARGET_NONE) and (TargetUID = 0)) then
begin
Result := True;
- if (trigData.trigSight = 0) or
- (trigData.trigShotTarget = TRIGGER_SHOT_TARGET_NONE) or
+ if (tgcSight = 0) or
+ (tgcShotTarget = TRIGGER_SHOT_TARGET_NONE) or
(TargetUID = ShotSightTarget) then
MakeShot(Trigger, wx, wy, xd, yd, TargetUID)
else
begin
- ShotSightTime := trigData.trigSight;
+ ShotSightTime := tgcSight;
ShotSightTargetN := TargetUID;
- if trigData.trigShotType = TRIGGER_SHOT_BFG then
+ if tgcShotType = TRIGGER_SHOT_BFG then
begin
g_Sound_PlayExAt('SOUND_WEAPON_STARTFIREBFG', wx, wy);
if g_Game_IsNet and g_Game_IsServer then
TRIGGER_EFFECT:
begin
- idx := trigData.trigFXCount;
+ idx := tgcFXCount;
while idx > 0 do
begin
- case trigData.trigFXPos of
+ case tgcFXPos of
TRIGGER_EFFECT_POS_CENTER:
begin
wx := X + Width div 2;
wy := Y + Height div 2;
end;
end;
- xd := trigData.trigVelX;
- yd := trigData.trigVelY;
- if trigData.trigSpreadL > 0 then xd -= Random(trigData.trigSpreadL+1);
- if trigData.trigSpreadR > 0 then xd += Random(trigData.trigSpreadR+1);
- if trigData.trigSpreadU > 0 then yd -= Random(trigData.trigSpreadU+1);
- if trigData.trigSpreadD > 0 then yd += Random(trigData.trigSpreadD+1);
+ xd := tgcVelX;
+ yd := tgcVelY;
+ if tgcSpreadL > 0 then xd -= Random(tgcSpreadL+1);
+ if tgcSpreadR > 0 then xd += Random(tgcSpreadR+1);
+ if tgcSpreadU > 0 then yd -= Random(tgcSpreadU+1);
+ if tgcSpreadD > 0 then yd += Random(tgcSpreadD+1);
tr_MakeEffect(wx, wy, xd, yd,
- trigData.trigFXType, trigData.trigFXSubType,
- trigData.trigFXRed, trigData.trigFXGreen, trigData.trigFXBlue, True, False);
+ tgcFXType, tgcFXSubType,
+ tgcFXRed, tgcFXGreen, tgcFXBlue, True, False);
Dec(idx);
end;
- TimeOut := trigData.trigWait;
+ TimeOut := tgcWait;
end;
end;
end;
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.trigData := triggers.itemAt[mapidx];
- if (Trigger.trigData = nil) then raise Exception.Create('LOAD: internal error in trigger loader');
- Trigger.mapId := Trigger.trigData.id;
+ 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.trigData.trigRec <> nil) then
+ if (Trigger.trigDataRec.trigRec <> nil) then
begin
- Trigger.trigData := Trigger.trigData.trigRec.clone({Trigger.trigData.headerRec}nil);
+ Trigger.trigDataRec := Trigger.trigDataRec.trigRec.clone(nil);
end
else
begin
- Trigger.trigData := nil;
+ Trigger.trigDataRec := nil;
end;
result := g_Triggers_Create(Trigger, arridx);
end;
fn, mapw: AnsiString;
f, olen: Integer;
begin
-// Íå ñîçäàâàòü âûõîä, åñëè èãðà áåç âûõîäà:
+ // Íå ñîçäàâàòü âûõîä, åñëè èãðà áåç âûõîäà
if (Trigger.TriggerType = TRIGGER_EXIT) and
(not LongBool(gGameSettings.Options and GAME_OPTION_ALLOWEXIT)) then
Trigger.TriggerType := TRIGGER_NONE;
-// Åñëè ìîíñòðû çàïðåùåíû, îòìåíÿåì òðèããåð:
+ // Åñëè ìîíñòðû çàïðåùåíû, îòìåíÿåì òðèããåð
if (Trigger.TriggerType = TRIGGER_SPAWNMONSTER) and
(not LongBool(gGameSettings.Options and GAME_OPTION_MONSTERS)) and
(gGameSettings.GameType <> GT_SINGLE) then
Trigger.TriggerType := TRIGGER_NONE;
-// Ñ÷èòàåì êîëè÷åñòâî ñåêðåòîâ íà êàðòå:
- if Trigger.TriggerType = TRIGGER_SECRET then
- gSecretsCount := gSecretsCount + 1;
+ // Ñ÷èòàåì êîëè÷åñòâî ñåêðåòîâ íà êàðòå
+ if Trigger.TriggerType = TRIGGER_SECRET then gSecretsCount += 1;
if (forceInternalIndex < 0) then
begin
end;
gTriggers[find_id] := Trigger;
- //e_LogWritefln('created trigger with map index %s, findid=%s (%s)', [Trigger.mapIndex, find_id, Trigger.mapId]);
-
- {
- writeln('trigger #', find_id, ': pos=(', Trigger.x, ',', Trigger.y, ')-(', Trigger.width, 'x', Trigger.height, ')',
- '; TexturePanel=', Trigger.TexturePanel,
- '; TexturePanelType=', Trigger.TexturePanelType,
- '; ShotPanelType=', Trigger.ShotPanelType,
- '; TriggerType=', Trigger.TriggerType,
- '; ActivateType=', Trigger.ActivateType,
- '; Keys=', Trigger.Keys,
- '; trigPanelId=', Trigger.trigPanelId,
- '; trigShotPanelId=', Trigger.trigShotPanelId
- );
- }
-
with gTriggers[find_id] do
begin
ID := find_id;
ClientID := gTriggerClientID;
end
else
+ begin
ClientID := 0;
+ end;
TimeOut := 0;
ActivateUID := 0;
PlayerCollide := False;
SpawnedCount := 0;
end;
-// Çàãðóæàåì çâóê, åñëè ýòî òðèããåð "Çâóê":
- if (Trigger.TriggerType = TRIGGER_SOUND) and
- (Trigger.trigData.trigSoundName <> '') then
+ // update cached trigger variables
+ trigUpdateCacheData(gTriggers[find_id], gTriggers[find_id].trigDataRec);
+
+ // Çàãðóæàåì çâóê, åñëè ýòî òðèããåð "Çâóê"
+ if (Trigger.TriggerType = TRIGGER_SOUND) and (Trigger.tgcSoundName <> '') then
begin
- // Åùå íåò òàêîãî çâóêà:
- if not g_Sound_Exists(Trigger.trigData.trigSoundName) then
+ // Åùå íåò òàêîãî çâóêà
+ if not g_Sound_Exists(Trigger.tgcSoundName) then
begin
- fn := g_ExtractWadName(Trigger.trigData.trigSoundName);
-
+ fn := g_ExtractWadName(Trigger.tgcSoundName);
if fn = '' then
- begin // Çâóê â ôàéëå ñ êàðòîé
- mapw := g_ExtractWadName(gMapInfo.Map);
- fn := mapw+':'+g_ExtractFilePathName(Trigger.trigData.trigSoundName);
- end
+ begin // Çâóê â ôàéëå ñ êàðòîé
+ mapw := g_ExtractWadName(gMapInfo.Map);
+ fn := mapw+':'+g_ExtractFilePathName(Trigger.tgcSoundName);
+ end
else // Çâóê â îòäåëüíîì ôàéëå
- fn := GameDir + '/wads/' + Trigger.trigData.trigSoundName;
+ begin
+ fn := GameDir + '/wads/' + Trigger.tgcSoundName;
+ end;
- if not g_Sound_CreateWADEx(Trigger.trigData.trigSoundName, fn) then
- g_FatalError(Format(_lc[I_GAME_ERROR_TR_SOUND], [fn, Trigger.trigData.trigSoundName]));
+ if not g_Sound_CreateWADEx(Trigger.tgcSoundName, fn) then
+ begin
+ g_FatalError(Format(_lc[I_GAME_ERROR_TR_SOUND], [fn, Trigger.tgcSoundName]));
+ end;
end;
- // Ñîçäàåì îáúåêò çâóêà:
+ // Ñîçäàåì îáúåêò çâóêà
with gTriggers[find_id] do
begin
Sound := TPlayableSound.Create();
- if not Sound.SetByName(Trigger.trigData.trigSoundName) then
+ if not Sound.SetByName(Trigger.tgcSoundName) then
begin
Sound.Free();
Sound := nil;
end;
end;
-// Çàãðóæàåì ìóçûêó, åñëè ýòî òðèããåð "Ìóçûêà":
- if (Trigger.TriggerType = TRIGGER_MUSIC) and
- (Trigger.trigData.trigMusicName <> '') then
+ // Çàãðóæàåì ìóçûêó, åñëè ýòî òðèããåð "Ìóçûêà"
+ if (Trigger.TriggerType = TRIGGER_MUSIC) and (Trigger.tgcMusicName <> '') then
begin
- // Åùå íåò òàêîé ìóçûêè:
- if not g_Sound_Exists(Trigger.trigData.trigMusicName) then
+ // Åùå íåò òàêîé ìóçûêè
+ if not g_Sound_Exists(Trigger.tgcMusicName) then
begin
- fn := g_ExtractWadName(Trigger.trigData.trigMusicName);
+ fn := g_ExtractWadName(Trigger.tgcMusicName);
if fn = '' then
- begin // Ìóçûêà â ôàéëå ñ êàðòîé
- mapw := g_ExtractWadName(gMapInfo.Map);
- fn := mapw+':'+g_ExtractFilePathName(Trigger.trigData.trigMusicName);
- end
+ begin // Ìóçûêà â ôàéëå ñ êàðòîé
+ mapw := g_ExtractWadName(gMapInfo.Map);
+ fn := mapw+':'+g_ExtractFilePathName(Trigger.tgcMusicName);
+ end
else // Ìóçûêà â ôàéëå ñ êàðòîé
- fn := GameDir+'/wads/'+Trigger.trigData.trigMusicName;
+ begin
+ fn := GameDir+'/wads/'+Trigger.tgcMusicName;
+ end;
- if not g_Sound_CreateWADEx(Trigger.trigData.trigMusicName, fn, True) then
- g_FatalError(Format(_lc[I_GAME_ERROR_TR_SOUND], [fn, Trigger.trigData.trigMusicName]));
+ if not g_Sound_CreateWADEx(Trigger.tgcMusicName, fn, True) then
+ begin
+ g_FatalError(Format(_lc[I_GAME_ERROR_TR_SOUND], [fn, Trigger.tgcMusicName]));
+ end;
end;
end;
-// Çàãðóæàåì äàííûå òðèããåðà "Òóðåëü":
+ // Çàãðóæàåì äàííûå òðèããåðà "Òóðåëü"
if Trigger.TriggerType = TRIGGER_SHOT then
+ begin
with gTriggers[find_id] do
begin
ShotPanelTime := 0;
ShotSightTimeout := 0;
ShotSightTarget := 0;
ShotSightTargetN := 0;
- ShotAmmoCount := Trigger.trigData.trigAmmo;
+ ShotAmmoCount := Trigger.tgcAmmo;
ShotReloadTime := 0;
end;
+ end;
Result := find_id;
end;
continue;
end;
// Ñ÷èòàåì, ÷òî îáúåêò ïîêèíóë çîíó äåéñòâèÿ òðèããåðà
- if (trigData.trigInterval = 0) and (Activators[b].TimeOut < 65530) then Activators[b].TimeOut := 0;
+ if (tgcInterval = 0) and (Activators[b].TimeOut < 65530) then Activators[b].TimeOut := 0;
end;
end;
if SpawnCooldown = 0 then
begin
// Åñëè ïðèøëî âðåìÿ, ñïàâíèì ìîíñòðà
- if (TriggerType = TRIGGER_SPAWNMONSTER) and (trigData.trigDelay > 0) then
+ if (TriggerType = TRIGGER_SPAWNMONSTER) and (tgcDelay > 0) then
begin
ActivateUID := 0;
ActivateTrigger(gTriggers[a], ACTIVATE_CUSTOM);
end;
// Åñëè ïðèøëî âðåìÿ, ñïàâíèì ïðåäìåò
- if (TriggerType = TRIGGER_SPAWNITEM) and (trigData.trigDelay > 0) then
+ if (TriggerType = TRIGGER_SPAWNITEM) and (tgcDelay > 0) then
begin
ActivateUID := 0;
ActivateTrigger(gTriggers[a], ACTIVATE_CUSTOM);
if ShotReloadTime > 0 then
begin
Dec(ShotReloadTime);
- if ShotReloadTime = 0 then ShotAmmoCount := trigData.trigAmmo;
+ if ShotReloadTime = 0 then ShotAmmoCount := tgcAmmo;
end;
end;
begin
if (SoundPlayCount > 0) and (not Sound.IsPlaying()) then
begin
- if trigData.trigPlayCount > 0 then SoundPlayCount -= 1; // Åñëè 0 - èãðàåì çâóê áåñêîíå÷íî
- if trigData.trigLocal then
+ if tgcPlayCount > 0 then SoundPlayCount -= 1; // Åñëè 0 - èãðàåì çâóê áåñêîíå÷íî
+ if tgcLocal then
begin
- Sound.PlayVolumeAt(X+(Width div 2), Y+(Height div 2), trigData.trigVolume/255.0);
+ Sound.PlayVolumeAt(X+(Width div 2), Y+(Height div 2), tgcVolume/255.0);
end
else
begin
- Sound.PlayPanVolume((trigData.trigPan-127.0)/128.0, trigData.trigVolume/255.0);
+ Sound.PlayPanVolume((tgcPan-127.0)/128.0, tgcVolume/255.0);
end;
if Sound.IsPlaying() and g_Game_IsNet and g_Game_IsServer then MH_SEND_TriggerSound(gTriggers[a]);
end;
// Òðèããåð "Ëîâóøêà" - ïîðà îòêðûâàòü
if (TriggerType = TRIGGER_TRAP) and (DoorTime = 0) and (g_Map_PanelByGUID(trigPanelGUID) <> nil) then
begin
- tr_OpenDoor(trigPanelGUID, trigData.trigSilent, trigData.trigD2d);
+ tr_OpenDoor(trigPanelGUID, tgcSilent, tgcD2d);
DoorTime := -1;
end;
else
begin
// Ïîêà îòêðûòà - çàêðûâàåì
- if tr_CloseDoor(trigPanelGUID, trigData.trigSilent, trigData.trigD2d) then DoorTime := -1;
+ if tr_CloseDoor(trigPanelGUID, tgcSilent, tgcD2d) then DoorTime := -1;
end;
end;
end;
// Òðèããåð - ðàñøèðèòåëü èëè ïåðåêëþ÷àòåëü, è ïðîøëà çàäåðæêà, è íàæàëè íóæíîå ÷èñëî ðàç:
if (TriggerType in [TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF]) and
- (PressTime = 0) and (PressCount >= trigData.trigPressCount) then
+ (PressTime = 0) and (PressCount >= tgcPressCount) then
begin
// Ñáðàñûâàåì çàäåðæêó àêòèâàöèè:
PressTime := -1;
// Ñáðàñûâàåì ñ÷åò÷èê íàæàòèé:
- if trigData.trigPressCount > 0 then PressCount -= trigData.trigPressCount else PressCount := 0;
+ if tgcPressCount > 0 then PressCount -= tgcPressCount else PressCount := 0;
// Îïðåäåëÿåì èçìåíÿåìûå èì òðèããåðû:
for b := 0 to High(gTriggers) do
begin
- if g_Collide(trigData.trigtX, trigData.trigtY, trigData.trigtWidth, trigData.trigtHeight, gTriggers[b].X, gTriggers[b].Y,
+ if g_Collide(tgctX, tgctY, tgctWidth, tgctHeight, gTriggers[b].X, gTriggers[b].Y,
gTriggers[b].Width, gTriggers[b].Height) and
- ((b <> a) or (trigData.trigWait > 0)) then
+ ((b <> a) or (tgcWait > 0)) then
begin // Can be self-activated, if there is Data.Wait
- if (not trigData.trigExtRandom) or gTriggers[b].Enabled then
+ if (not tgcExtRandom) or gTriggers[b].Enabled then
begin
SetLength(Affected, Length(Affected) + 1);
Affected[High(Affected)] := b;
TRIGGER_OFF: pan.movingActive := false;
TRIGGER_ONOFF: pan.movingActive := not pan.movingActive;
end;
- if not trigData.trigSilent and (Length(trigData.trigSound) > 0) then
+ if not tgcSilent and (Length(tgcSound) > 0) then
begin
- g_Sound_PlayExAt(trigData.trigSound, X, Y);
- if g_Game_IsServer and g_Game_IsNet then MH_SEND_Sound(X, Y, trigData.trigSound);
+ g_Sound_PlayExAt(tgcSound, X, Y);
+ if g_Game_IsServer and g_Game_IsNet then MH_SEND_Sound(X, Y, tgcSound);
end;
end;
// Âûáèðàåì îäèí èç òðèããåðîâ äëÿ ðàñøèðèòåëÿ, åñëè âêëþ÷åí ðàíäîì:
- if (TriggerType = TRIGGER_PRESS) and trigData.trigExtRandom then
+ if (TriggerType = TRIGGER_PRESS) and tgcExtRandom then
begin
if (Length(Affected) > 0) then
begin
(TriggerType = TRIGGER_DOOR5) or
(TriggerType = TRIGGER_DOOR) then
begin
- tr_OpenDoor(trigPanelGUID, True, trigData.trigD2d);
+ tr_OpenDoor(trigPanelGUID, True, tgcD2d);
if TriggerType = TRIGGER_DOOR5 then DoorTime := 180;
b := True;
end;
Dec(gTriggers[ID].SpawnedCount);
end;
-procedure g_Triggers_Free();
+
+procedure g_Triggers_Free ();
var
a: Integer;
begin
begin
if (gTriggers[a].TriggerType = TRIGGER_SOUND) then
begin
- if g_Sound_Exists(gTriggers[a].trigData.trigSoundName) then
+ if g_Sound_Exists(gTriggers[a].tgcSoundName) then
begin
- g_Sound_Delete(gTriggers[a].trigData.trigSoundName);
+ g_Sound_Delete(gTriggers[a].tgcSoundName);
end;
gTriggers[a].Sound.Free();
end;
begin
SetLength(gTriggers[a].Activators, 0);
end;
- gTriggers[a].trigData.Free();
+ gTriggers[a].trigDataRec.Free();
end;
gTriggers := nil;
SetLength(gMonstersSpawned, 0);
end;
+
procedure g_Triggers_SaveState(var Mem: TBinMemoryWriter);
var
- count, act_count, i, j: Integer;
+ count, actCount, i, j: Integer;
dw: DWORD;
sg: Single;
b: Boolean;
begin
// Ñ÷èòàåì êîëè÷åñòâî ñóùåñòâóþùèõ òðèããåðîâ
count := Length(gTriggers);
+ Mem := TBinMemoryWriter.Create((count+1)*200);
- Mem := TBinMemoryWriter.Create((count+1) * 200);
-
- // Êîëè÷åñòâî òðèããåðîâ:
+ // Êîëè÷åñòâî òðèããåðîâ
Mem.WriteInt(count);
-
- //e_LogWritefln('saving %s triggers (count=%s)', [Length(gTriggers), count]);
-
- if count = 0 then exit;
+ if (count = 0) then exit;
for i := 0 to High(gTriggers) do
begin
- // Ñèãíàòóðà òðèããåðà:
+ // Ñèãíàòóðà òðèããåðà
dw := TRIGGER_SIGNATURE; // 'TRGX'
Mem.WriteDWORD(dw);
- // Òèï òðèããåðà:
+ // Òèï òðèããåðà
Mem.WriteByte(gTriggers[i].TriggerType);
if (gTriggers[i].TriggerType = TRIGGER_NONE) then continue; // empty one
- // Ñïåöèàëüíûå äàííûå òðèããåðà: äà â æîïó, ïîòîì èç êàðòû îïÿòü âûòàùèì; ñîõðàíèì òîëüêî èíäåêñ
- //e_LogWritefln('=== trigger #%s saved ===', [gTriggers[i].mapIndex]);
+ // Ñïåöèàëüíûå äàííûå òðèããåðà: ïîòîì èç êàðòû îïÿòü âûòàùèì; ñîõðàíèì òîëüêî èíäåêñ
Mem.WriteInt(gTriggers[i].mapIndex);
- //p := @gTriggers[i].Data;
- //Mem.WriteMemory(p, SizeOf(TTriggerData));
- // Êîîðäèíàòû ëåâîãî âåðõíåãî óãëà:
+ // Êîîðäèíàòû ëåâîãî âåðõíåãî óãëà
Mem.WriteInt(gTriggers[i].X);
Mem.WriteInt(gTriggers[i].Y);
- // Ðàçìåðû:
+ // Ðàçìåðû
Mem.WriteWord(gTriggers[i].Width);
Mem.WriteWord(gTriggers[i].Height);
- // Âêëþ÷åí ëè òðèããåð:
+ // Âêëþ÷åí ëè òðèããåð
Mem.WriteBoolean(gTriggers[i].Enabled);
- // Òèï àêòèâàöèè òðèããåðà:
+ // Òèï àêòèâàöèè òðèããåðà
Mem.WriteByte(gTriggers[i].ActivateType);
- // Êëþ÷è, íåîáõîäèìûå äëÿ àêòèâàöèè:
+ // Êëþ÷è, íåîáõîäèìûå äëÿ àêòèâàöèè
Mem.WriteByte(gTriggers[i].Keys);
- // ID ïàíåëè, òåêñòóðà êîòîðîé èçìåíèòñÿ:
+ // ID ïàíåëè, òåêñòóðà êîòîðîé èçìåíèòñÿ
Mem.WriteInt(gTriggers[i].TexturePanelGUID);
- // Òèï ýòîé ïàíåëè:
+ // Òèï ýòîé ïàíåëè
Mem.WriteWord(gTriggers[i].TexturePanelType);
- // Âíóòðåííèé íîìåð äðóãîé ïàíåëè (ïî ñ÷àñòëèâîé ñëó÷àéíîñòè îí áóäåò ñîâïàäàòü ñ òåì, ÷òî ñîçäàíî ïðè çàãðóçêå êàðòû)
+ // Âíóòðåííèé íîìåð äðóãîé ïàíåëè (ïî ñ÷àñòëèâîé ñëó÷àéíîñòè îí áóäåò ñîâïàäàòü ñ òåì, ÷òî ñîçäàíî ïðè çàãðóçêå êàðòû)
Mem.WriteInt(gTriggers[i].trigPanelGUID);
- // Âðåìÿ äî âîçìîæíîñòè àêòèâàöèè:
+ // Âðåìÿ äî âîçìîæíîñòè àêòèâàöèè
Mem.WriteWord(gTriggers[i].TimeOut);
- // UID òîãî, êòî àêòèâèðîâàë ýòîò òðèããåð:
+ // UID òîãî, êòî àêòèâèðîâàë ýòîò òðèããåð
Mem.WriteWord(gTriggers[i].ActivateUID);
- // Ñïèñîê UID-îâ îáúåêòîâ, êîòîðûå íàõîäèëèñü ïîä âîçäåéñòâèåì:
- act_count := Length(gTriggers[i].Activators);
- Mem.WriteInt(act_count);
- for j := 0 to act_count-1 do
+ // Ñïèñîê UID-îâ îáúåêòîâ, êîòîðûå íàõîäèëèñü ïîä âîçäåéñòâèåì
+ actCount := Length(gTriggers[i].Activators);
+ Mem.WriteInt(actCount);
+ for j := 0 to actCount-1 do
begin
// UID îáúåêòà
Mem.WriteWord(gTriggers[i].Activators[j].UID);
// Âðåìÿ îæèäàíèÿ
Mem.WriteWord(gTriggers[i].Activators[j].TimeOut);
end;
- // Ñòîèò ëè èãðîê â îáëàñòè òðèããåðà:
+ // Ñòîèò ëè èãðîê â îáëàñòè òðèããåðà
Mem.WriteBoolean(gTriggers[i].PlayerCollide);
- // Âðåìÿ äî çàêðûòèÿ äâåðè:
+ // Âðåìÿ äî çàêðûòèÿ äâåðè
Mem.WriteInt(gTriggers[i].DoorTime);
- // Çàäåðæêà àêòèâàöèè:
+ // Çàäåðæêà àêòèâàöèè
Mem.WriteInt(gTriggers[i].PressTime);
- // Ñ÷åò÷èê íàæàòèé:
+ // Ñ÷åò÷èê íàæàòèé
Mem.WriteInt(gTriggers[i].PressCount);
- // Ñïàâíåð àêòèâåí:
+ // Ñïàâíåð àêòèâåí
Mem.WriteBoolean(gTriggers[i].AutoSpawn);
- // Çàäåðæêà ñïàâíåðà:
+ // Çàäåðæêà ñïàâíåðà
Mem.WriteInt(gTriggers[i].SpawnCooldown);
- // Ñ÷åò÷èê ñîçäàíèÿ îáúåêòîâ:
+ // Ñ÷åò÷èê ñîçäàíèÿ îáúåêòîâ
Mem.WriteInt(gTriggers[i].SpawnedCount);
- // Ñêîëüêî ðàç ïðîèãðàí çâóê:
+ // Ñêîëüêî ðàç ïðîèãðàí çâóê
Mem.WriteInt(gTriggers[i].SoundPlayCount);
- // Ïðîèãðûâàåòñÿ ëè çâóê?
- if gTriggers[i].Sound <> nil then
- b := gTriggers[i].Sound.IsPlaying()
- else
- b := False;
+ // Ïðîèãðûâàåòñÿ ëè çâóê?
+ if (gTriggers[i].Sound <> nil) then b := gTriggers[i].Sound.IsPlaying() else b := false;
Mem.WriteBoolean(b);
if b then
begin
- // Ïîçèöèÿ ïðîèãðûâàíèÿ çâóêà:
+ // Ïîçèöèÿ ïðîèãðûâàíèÿ çâóêà
dw := gTriggers[i].Sound.GetPosition();
Mem.WriteDWORD(dw);
- // Ãðîìêîñòü çâóêà:
+ // Ãðîìêîñòü çâóêà
sg := gTriggers[i].Sound.GetVolume();
sg := sg / (gSoundLevel/255.0);
Mem.WriteSingle(sg);
- // Ñòåðåî ñìåùåíèå çâóêà:
+ // Ñòåðåî ñìåùåíèå çâóêà
sg := gTriggers[i].Sound.GetPan();
Mem.WriteSingle(sg);
end;
end;
end;
-procedure g_Triggers_LoadState(var Mem: TBinMemoryReader);
+
+procedure g_Triggers_LoadState (var Mem: TBinMemoryReader);
var
- count, act_count, i, j, a: Integer;
+ count, actCount, i, j, a: Integer;
dw: DWORD;
vol, pan: Single;
b: Boolean;
- //p: Pointer;
Trig: TTrigger;
mapIndex: Integer;
- //tw: TStrTextWriter;
begin
- if Mem = nil then
- Exit;
+ if (Mem = nil) then exit;
g_Triggers_Free();
-// Êîëè÷åñòâî òðèããåðîâ:
+ // Êîëè÷åñòâî òðèããåðîâ
Mem.ReadInt(count);
-
if (count = 0) then exit;
for a := 0 to count-1 do
begin
- // Ñèãíàòóðà òðèããåðà:
- Mem.ReadDWORD(dw);
- if (dw <> TRIGGER_SIGNATURE) then // 'TRGX'
- begin
- raise EBinSizeError.Create('g_Triggers_LoadState: Wrong Trigger Signature');
- end;
- // Òèï òðèããåðà:
+ // Ñèãíàòóðà òðèããåðà
+ Mem.ReadDWORD(dw); // 'TRGX'
+ if (dw <> TRIGGER_SIGNATURE) then raise EBinSizeError.Create('g_Triggers_LoadState: Wrong Trigger Signature');
+ // Òèï òðèããåðà
Mem.ReadByte(Trig.TriggerType);
- // Ñïåöèàëüíûå äàííûå òðèããåðà: èíäåêñ â gCurrentMap.field['triggers']
+ // Ñïåöèàëüíûå äàííûå òðèããåðà: èíäåêñ â gCurrentMap.field['triggers']
if (Trig.TriggerType = TRIGGER_NONE) then continue; // empty one
Mem.ReadInt(mapIndex);
- //!!!FIXME!!!
- {
- Mem.ReadMemory(p, dw);
- if dw <> SizeOf(TTriggerData) then
- begin
- raise EBinSizeError.Create('g_Triggers_LoadState: Wrong TriggerData Size');
- end;
- Trig.Data := TTriggerData(p^);
- }
- // Ñîçäàåì òðèããåð:
i := g_Triggers_CreateWithMapIndex(Trig, a, mapIndex);
{
if (gTriggers[i].trigData <> nil) then
// UID òîãî, êòî àêòèâèðîâàë ýòîò òðèããåð:
Mem.ReadWord(gTriggers[i].ActivateUID);
// Ñïèñîê UID-îâ îáúåêòîâ, êîòîðûå íàõîäèëèñü ïîä âîçäåéñòâèåì:
- Mem.ReadInt(act_count);
- if act_count > 0 then
+ Mem.ReadInt(actCount);
+ if actCount > 0 then
begin
- SetLength(gTriggers[i].Activators, act_count);
- for j := 0 to act_count-1 do
+ SetLength(gTriggers[i].Activators, actCount);
+ for j := 0 to actCount-1 do
begin
// UID îáúåêòà
Mem.ReadWord(gTriggers[i].Activators[j].UID);
diff --git a/src/shared/MAPDEF.pas b/src/shared/MAPDEF.pas
index ecfad90a9710b2acbf0d8d79cce801f7d1a2de92..9875fa1fd26aa35501d8ee4609f9ddeec47113e2 100644 (file)
--- a/src/shared/MAPDEF.pas
+++ b/src/shared/MAPDEF.pas
function getPanelByIdx (idx: Integer): TDynRecord; inline;
- function getPanelId (): Integer; inline;
+ //function getPanelId (): Integer; inline;
//procedure setPanelId (v: Integer); inline;
function getTexturePanel (): Integer; inline;
property panel[idx: Integer]: TDynRecord read getPanelByIdx;
property panelIndex[pan: TDynRecord]: Integer read getPanelIndex;
// triggers
- property tgPanelID: Integer read getPanelId {write setPanelId};
- property tgShotPanelID: Integer read getPanelId {write setPanelId};
+ property tgPanelID: Integer read trigPanelId {write setPanelId};
+ property tgShotPanelID: Integer read trigPanelId {write setPanelId};
property TexturePanel: Integer read getTexturePanel {write setTexturePanel}; // texturepanel, int
// user fields
property userPanelId: Integer read getUserPanelId write setUserPanelId;
var
fld: TDynField;
begin
- fld := getFieldWithType('monsterid', TDynField.TType.TInt);
+ result := -1;
+ fld := field['monsterid'];
+ if (fld = nil) then exit;
+ if (fld.baseType <> TDynField.TType.TInt) then exit;
+ if (fld.recref = nil) then exit;
result := fld.recrefIndex;
end;
var
fld: TDynField;
begin
- fld := getFieldWithType('panelid', TDynField.TType.TInt);
+ result := -1;
+ fld := field['panelid'];
+ if (fld = nil) then exit;
+ if (fld.baseType <> TDynField.TType.TInt) then exit;
+ if (fld.recref = nil) then exit;
result := fld.recrefIndex;
end;
@@ -374,7 +382,7 @@ function TDynRecordHelper.TriggerType (): Byte; inline; begin result := Byte(get
function TDynRecordHelper.ActivateType (): Byte; inline; begin result := Byte(getFieldWithType('activate_type', TDynField.TType.TUByte).ival); end;
function TDynRecordHelper.Keys (): Byte; inline; begin result := Byte(getFieldWithType('keys', TDynField.TType.TUByte).ival); end;
-function TDynRecordHelper.getPanelId (): Integer; inline; begin result := getFieldWithType('panelid', TDynField.TType.TInt).recrefIndex; end;
+//function TDynRecordHelper.getPanelId (): Integer; inline; begin result := getFieldWithType('panelid', TDynField.TType.TInt).recrefIndex; end;
function TDynRecordHelper.getTexturePanel (): Integer; begin result := getFieldWithType('texture_panel', TDynField.TType.TInt).recrefIndex; end;
{$INCLUDE mapdef_impl.inc}
diff --git a/src/shared/mapdef_tgc_def.inc b/src/shared/mapdef_tgc_def.inc
--- /dev/null
@@ -0,0 +1,117 @@
+// trigger cache
+
+//TRIGGER_EXIT
+tgcMap: AnsiString;
+
+//TRIGGER_TELEPORT
+tgcTarget: TDFPoint;
+tgcD2d: Boolean;
+tgcSilent: Boolean;
+tgcDirection: Byte;
+
+//TRIGGER_OPENDOOR
+//TRIGGER_CLOSEDOOR
+//TRIGGER_DOOR
+//TRIGGER_DOOR5
+//TRIGGER_CLOSETRAP
+//TRIGGER_TRAP
+//TRIGGER_LIFTUP
+//TRIGGER_LIFTDOWN
+//TRIGGER_LIFT
+
+//TRIGGER_PRESS
+//TRIGGER_ON
+//TRIGGER_OFF
+//TRIGGER_ONOFF
+tgcTX: LongInt;
+tgcTY: LongInt;
+tgcTWidth: LongInt;
+tgcTHeight: LongInt;
+tgcWait: Word;
+tgcPressCount: Word;
+tgcExtRandom: Boolean;
+tgcSound: AnsiString;
+
+//TRIGGER_SECRET
+
+//TRIGGER_TEXTURE
+tgcActivateOnce: Boolean;
+tgcAnimateOnce: Boolean;
+
+//TRIGGER_SOUND
+tgcSoundName: AnsiString;
+tgcVolume: Byte;
+tgcPan: Byte;
+tgcLocal: Boolean;
+tgcPlayCount: Byte;
+tgcSoundSwitch: Boolean;
+
+//TRIGGER_SPAWNMONSTER
+tgcSpawnMonsType: Byte;
+tgcHealth: LongInt;
+tgcActive: Boolean;
+tgcMonsCount: LongInt;
+tgcEffect: Byte;
+tgcMax: Word;
+tgcDelay: Word;
+tgcBehaviour: Byte;
+
+//TRIGGER_SPAWNITEM
+tgcSpawnItemType: Byte;
+tgcGravity: Boolean;
+tgcDmonly: Boolean;
+tgcItemCount: LongInt;
+
+//TRIGGER_MUSIC
+tgcMusicName: AnsiString;
+tgcMusicAction: Byte;
+
+//TRIGGER_PUSH
+tgcAngle: Word;
+tgcForce: Byte;
+tgcResetVelocity: Boolean;
+
+//TRIGGER_SCORE
+tgcScoreAction: Byte;
+tgcScoreCount: Byte;
+tgcScoreTeam: Byte;
+tgcScoreCon: Boolean;
+tgcScoreMsg: Boolean;
+
+//TRIGGER_MESSAGE
+tgcKind: Byte;
+tgcMsgDest: Byte;
+tgcText: AnsiString;
+tgcMsgTime: Word;
+
+//TRIGGER_DAMAGE
+tgcAmount: Word;
+tgcInterval: Word;
+
+//TRIGGER_HEALTH
+tgcHealMax: Boolean;
+
+//TRIGGER_SHOT
+tgcShotType: Byte;
+tgcShotTarget: Byte;
+tgcQuiet: Boolean;
+tgcAim: SmallInt;
+tgcSight: Word;
+tgcAccuracy: Word;
+tgcAmmo: Word;
+tgcReload: Word;
+
+//TRIGGER_EFFECT
+tgcFXCount: Byte;
+tgcFXType: Byte;
+tgcFXSubType: Byte;
+tgcFXRed: Byte;
+tgcFXGreen: Byte;
+tgcFXBlue: Byte;
+tgcFXPos: Byte;
+tgcVelX: SmallInt;
+tgcVelY: SmallInt;
+tgcSpreadL: Byte;
+tgcSpreadR: Byte;
+tgcSpreadU: Byte;
+tgcSpreadD: Byte;
diff --git a/src/shared/mapdef_tgc_impl.inc b/src/shared/mapdef_tgc_impl.inc
--- /dev/null
@@ -0,0 +1,159 @@
+// trigger cache loader
+// set `TriggerType` in `tgt` before calling this
+procedure trigUpdateCacheData (var tgt: TTrigger; tdata: TDynRecord);
+begin
+ case tgt.TriggerType of
+ TRIGGER_EXIT:
+ begin
+ tgt.tgcMap := tdata.trigMap;
+ end;
+ TRIGGER_TELEPORT:
+ begin
+ tgt.tgcTarget := tdata.trigTarget;
+ tgt.tgcD2d := tdata.trigD2d;
+ tgt.tgcSilent := tdata.trigSilent;
+ tgt.tgcDirection := tdata.trigDirection;
+ end;
+ TRIGGER_OPENDOOR,
+ TRIGGER_CLOSEDOOR,
+ TRIGGER_DOOR,
+ TRIGGER_DOOR5,
+ TRIGGER_CLOSETRAP,
+ TRIGGER_TRAP,
+ TRIGGER_LIFTUP,
+ TRIGGER_LIFTDOWN,
+ TRIGGER_LIFT:
+ begin
+ tgt.tgcSilent := tdata.trigSilent;
+ tgt.tgcD2d := tdata.trigD2d;
+ end;
+ TRIGGER_PRESS,
+ TRIGGER_ON,
+ TRIGGER_OFF,
+ TRIGGER_ONOFF:
+ begin
+ tgt.tgcTX := tdata.trigTX;
+ tgt.tgcTY := tdata.trigTX;
+ tgt.tgcTWidth := tdata.trigTWidth;
+ tgt.tgcTHeight := tdata.trigTHeight;
+ tgt.tgcWait := tdata.trigWait;
+ tgt.tgcPressCount := tdata.trigPressCount;
+ tgt.tgcExtRandom := tdata.trigExtRandom;
+ tgt.tgcSilent := tdata.trigSilent;
+ tgt.tgcSound := tdata.trigSound;
+ end;
+ TRIGGER_SECRET:
+ begin
+ end;
+ TRIGGER_TEXTURE:
+ begin
+ tgt.tgcActivateOnce := tdata.trigActivateOnce;
+ tgt.tgcAnimateOnce := tdata.trigAnimateOnce;
+ end;
+ TRIGGER_SOUND:
+ begin
+ tgt.tgcSoundName := tdata.trigSoundName;
+ tgt.tgcVolume := tdata.trigVolume;
+ tgt.tgcPan := tdata.trigPan;
+ tgt.tgcLocal := tdata.trigLocal;
+ tgt.tgcPlayCount := tdata.trigPlayCount;
+ tgt.tgcSoundSwitch := tdata.trigSoundSwitch;
+ end;
+ TRIGGER_SPAWNMONSTER:
+ begin
+ tgt.tgcTX := tdata.trigTX;
+ tgt.tgcTY := tdata.trigTX;
+ tgt.tgcSpawnMonsType := tdata.trigSpawnMonsType;
+ tgt.tgcHealth := tdata.trigHealth;
+ tgt.tgcDirection := tdata.trigDirection;
+ tgt.tgcActive := tdata.trigActive;
+ tgt.tgcMonsCount := tdata.trigMonsCount;
+ tgt.tgcEffect := tdata.trigEffect;
+ tgt.tgcMax := tdata.trigMax;
+ tgt.tgcDelay := tdata.trigDelay;
+ tgt.tgcBehaviour := tdata.trigBehaviour;
+ end;
+ TRIGGER_SPAWNITEM:
+ begin
+ tgt.tgcTX := tdata.trigTX;
+ tgt.tgcTY := tdata.trigTX;
+ tgt.tgcSpawnItemType := tdata.trigSpawnItemType;
+ tgt.tgcGravity := tdata.trigGravity;
+ tgt.tgcDmonly := tdata.trigDmonly;
+ tgt.tgcItemCount := tdata.trigItemCount;
+ tgt.tgcEffect := tdata.trigEffect;
+ tgt.tgcMax := tdata.trigMax;
+ tgt.tgcDelay := tdata.trigDelay;
+ end;
+ TRIGGER_MUSIC:
+ begin
+ tgt.tgcMusicName := tdata.trigMusicName;
+ tgt.tgcMusicAction := tdata.trigMusicAction;
+ end;
+ TRIGGER_PUSH:
+ begin
+ tgt.tgcAngle := tdata.trigAngle;
+ tgt.tgcForce := tdata.trigForce;
+ tgt.tgcResetVelocity := tdata.trigResetVelocity;
+ end;
+ TRIGGER_SCORE:
+ begin
+ tgt.tgcScoreAction := tdata.trigScoreAction;
+ tgt.tgcScoreCount := tdata.trigScoreCount;
+ tgt.tgcScoreTeam := tdata.trigScoreTeam;
+ tgt.tgcScoreCon := tdata.trigScoreCon;
+ tgt.tgcScoreMsg := tdata.trigScoreMsg;
+ end;
+ TRIGGER_MESSAGE:
+ begin
+ tgt.tgcKind := tdata.trigKind;
+ tgt.tgcMsgDest := tdata.trigMsgDest;
+ tgt.tgcText := tdata.trigText;
+ tgt.tgcMsgTime := tdata.trigMsgTime;
+ end;
+ TRIGGER_DAMAGE:
+ begin
+ tgt.tgcAmount := tdata.trigAmount;
+ tgt.tgcInterval := tdata.trigInterval;
+ end;
+ TRIGGER_HEALTH:
+ begin
+ tgt.tgcAmount := tdata.trigAmount;
+ tgt.tgcInterval := tdata.trigInterval;
+ tgt.tgcHealMax := tdata.trigHealMax;
+ tgt.tgcSilent := tdata.trigSilent;
+ end;
+ TRIGGER_SHOT:
+ begin
+ tgt.tgcTX := tdata.trigTX;
+ tgt.tgcTY := tdata.trigTX;
+ tgt.tgcShotType := tdata.trigShotType;
+ tgt.tgcShotTarget := tdata.trigShotTarget;
+ tgt.tgcQuiet := tdata.trigQuiet;
+ tgt.tgcAim := tdata.trigAim;
+ tgt.tgcSight := tdata.trigSight;
+ tgt.tgcAngle := tdata.trigAngle;
+ tgt.tgcWait := tdata.trigWait;
+ tgt.tgcAccuracy := tdata.trigAccuracy;
+ tgt.tgcAmmo := tdata.trigAmmo;
+ tgt.tgcReload := tdata.trigReload;
+ end;
+ TRIGGER_EFFECT:
+ begin
+ tgt.tgcFXCount := tdata.trigFXCount;
+ tgt.tgcFXType := tdata.trigFXType;
+ tgt.tgcFXSubType := tdata.trigFXSubType;
+ tgt.tgcFXRed := tdata.trigFXRed;
+ tgt.tgcFXGreen := tdata.trigFXGreen;
+ tgt.tgcFXBlue := tdata.trigFXBlue;
+ tgt.tgcFXPos := tdata.trigFXPos;
+ tgt.tgcWait := tdata.trigWait;
+ tgt.tgcVelX := tdata.trigVelX;
+ tgt.tgcVelY := tdata.trigVelY;
+ tgt.tgcSpreadL := tdata.trigSpreadL;
+ tgt.tgcSpreadR := tdata.trigSpreadR;
+ tgt.tgcSpreadU := tdata.trigSpreadU;
+ tgt.tgcSpreadD := tdata.trigSpreadD;
+ end;
+ end;
+end;
diff --git a/src/tools/mapgen.dpr b/src/tools/mapgen.dpr
index 0298aaaae89a6f6e4fba085ab6fdc941fbd56bb3..8a23afa7e46f99fc915417b1821d949660e35ff6 100644 (file)
--- a/src/tools/mapgen.dpr
+++ b/src/tools/mapgen.dpr
type
THashStrFld = specialize THashBase<AnsiString, TDynField>;
+
+// ////////////////////////////////////////////////////////////////////////// //
var
- pr: TTextParser;
dfmapdef: TDynMapDef;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+procedure genTrigCacheVars (const fname: AnsiString);
+var
+ fo: TextFile;
+ tidx, fidx, nidx: Integer;
+ trec: TDynRecord;
+ fld: TDynField;
+ palias: AnsiString;
+ fldknown: THashStrFld = nil; // key: palias; value: prev field
+begin
+ AssignFile(fo, fname);
+ {$I+}Rewrite(fo);{$I-}
+
+ fldknown := THashStrFld.Create(hsihash, hsiequ);
+
+ write(fo, '// trigger cache'#10);
+ for tidx := 0 to dfmapdef.trigTypeCount-1 do
+ begin
+ // header comment
+ write(fo, #10);
+ trec := dfmapdef.trigTypeAt[tidx];
+ for nidx := 0 to trec.forTrigCount-1 do
+ begin
+ write(fo, '//', trec.forTrigAt[nidx], #10);
+ end;
+ // fields
+ for fidx := 0 to trec.count-1 do
+ begin
+ fld := trec.fieldAt[fidx];
+ if fld.internal then continue;
+ // HACK!
+ if (fld.name = 'panelid') or (fld.name = 'monsterid') then
+ begin
+ //writeln('skipping <', fld.name, '>');
+ continue;
+ end;
+ palias := fld.palias(true);
+ // don't write duplicate fields
+ if fldknown.has(toLowerCase1251(palias)) then continue;
+ fldknown.put(toLowerCase1251(palias), fld);
+ // write field definition
+ case fld.baseType of
+ TDynField.TType.TBool: write(fo, 'tgc', palias, ': Boolean;'#10);
+ TDynField.TType.TChar: write(fo, 'tgc', palias, ': AnsiString;'#10);
+ TDynField.TType.TByte: write(fo, 'tgc', palias, ': SmallInt;'#10);
+ TDynField.TType.TUByte: write(fo, 'tgc', palias, ': Byte;'#10);
+ TDynField.TType.TShort: write(fo, 'tgc', palias, ': ShortInt;'#10);
+ TDynField.TType.TUShort: write(fo, 'tgc', palias, ': Word;'#10);
+ TDynField.TType.TInt: write(fo, 'tgc', palias, ': LongInt;'#10);
+ TDynField.TType.TUInt: write(fo, 'tgc', palias, ': LongWord;'#10);
+ TDynField.TType.TString: write(fo, 'tgc', palias, ': AnsiString;'#10);
+ TDynField.TType.TPoint:
+ begin
+ if fld.hasTPrefix then
+ begin
+ write(fo, 'tgcTX: LongInt;'#10);
+ write(fo, 'tgcTY: LongInt;'#10);
+ end
+ else if fld.separatePasFields then
+ begin
+ write(fo, 'tgcX: LongInt;'#10);
+ write(fo, 'tgcY: LongInt;'#10);
+ end
+ else
+ begin
+ write(fo, 'tgc', palias, ': TDFPoint;'#10);
+ end;
+ end;
+ TDynField.TType.TSize:
+ begin
+ if fld.hasTPrefix then
+ begin
+ write(fo, 'tgcTWidth: LongInt;'#10);
+ write(fo, 'tgcTHeight: LongInt;'#10);
+ end
+ else if fld.separatePasFields then
+ begin
+ write(fo, 'tgcWidth: LongInt;'#10);
+ write(fo, 'tgcHeight: LongInt;'#10);
+ end
+ else
+ begin
+ write(fo, 'tgc', palias, ': TDFSize;'#10);
+ end;
+ end;
+ TDynField.TType.TList:
+ raise Exception.Create('no lists in triggers, pelase');
+ TDynField.TType.TTrigData:
+ raise Exception.Create('no triggers in triggers, pelase');
+ end;
+ end;
+ end;
+
+ CloseFile(fo);
+ fldknown.Free();
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+procedure genTrigLoadCache (const fname: AnsiString);
+var
+ fo: TextFile;
+ tidx, fidx, nidx: Integer;
+ trec: TDynRecord;
+ fld: TDynField;
+ palias: AnsiString;
+ needComma: Boolean;
+begin
+ AssignFile(fo, fname);
+ {$I+}Rewrite(fo);{$I-}
+
+ write(fo, '// trigger cache loader'#10);
+ write(fo, '// set `TriggerType` in `tgt` before calling this'#10);
+ write(fo, 'procedure trigUpdateCacheData (var tgt: TTrigger; tdata: TDynRecord);'#10);
+ write(fo, 'begin'#10);
+ write(fo, ' case tgt.TriggerType of'#10);
+ for tidx := 0 to dfmapdef.trigTypeCount-1 do
+ begin
+ // case switch
+ needComma := false;
+ write(fo, ' ');
+ trec := dfmapdef.trigTypeAt[tidx];
+ for nidx := 0 to trec.forTrigCount-1 do
+ begin
+ if needComma then write(fo, ','#10' ') else needComma := true;
+ write(fo, trec.forTrigAt[nidx]);
+ end;
+ write(fo, ':'#10);
+ write(fo, ' begin'#10);
+ // fields
+ for fidx := 0 to trec.count-1 do
+ begin
+ fld := trec.fieldAt[fidx];
+ if fld.internal then continue;
+ // HACK!
+ if (fld.name = 'panelid') or (fld.name = 'monsterid') then
+ begin
+ //writeln('skipping <', fld.name, '>');
+ continue;
+ end;
+ palias := fld.palias(true);
+ // write field definition
+ case fld.baseType of
+ TDynField.TType.TBool,
+ TDynField.TType.TChar,
+ TDynField.TType.TByte,
+ TDynField.TType.TUByte,
+ TDynField.TType.TShort,
+ TDynField.TType.TUShort,
+ TDynField.TType.TInt,
+ TDynField.TType.TUInt,
+ TDynField.TType.TString:
+ write(fo, ' tgt.tgc', palias, ' := tdata.trig', palias, ';'#10);
+ TDynField.TType.TPoint:
+ begin
+ if fld.hasTPrefix then
+ begin
+ write(fo, ' tgt.tgcTX := tdata.trigTX;'#10);
+ write(fo, ' tgt.tgcTY := tdata.trigTX;'#10);
+ end
+ else if fld.separatePasFields then
+ begin
+ write(fo, ' tgt.tgcX := tdata.trigX;'#10);
+ write(fo, ' tgt.tgcY := tdata.trigX;'#10);
+ end
+ else
+ begin
+ write(fo, ' tgt.tgc', palias, ' := tdata.trig', palias, ';'#10);
+ end;
+ end;
+ TDynField.TType.TSize:
+ begin
+ if fld.hasTPrefix then
+ begin
+ write(fo, ' tgt.tgcTWidth := tdata.trigTWidth;'#10);
+ write(fo, ' tgt.tgcTHeight := tdata.trigTHeight;'#10);
+ end
+ else if fld.separatePasFields then
+ begin
+ write(fo, ' tgt.tgcWidth := tdata.trigWidth;'#10);
+ write(fo, ' tgt.tgcHeight := tdata.trigHeight;'#10);
+ end
+ else
+ begin
+ write(fo, ' tgt.tgc', palias, ' := tdata.trig', palias, ';'#10);
+ end;
+ end;
+ TDynField.TType.TList:
+ raise Exception.Create('no lists in triggers, pelase');
+ TDynField.TType.TTrigData:
+ raise Exception.Create('no triggers in triggers, pelase');
+ end;
+ end;
+ write(fo, ' end;'#10);
+ end;
+ write(fo, ' end;'#10);
+ write(fo, 'end;'#10);
+
+ CloseFile(fo);
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+var
+ pr: TTextParser;
fo, fohlp, foimpl: TextFile;
st: TStream = nil;
ch: AnsiChar;
writeln('writing "mapdef.inc"...');
AssignFile(fo, 'mapdef.inc');
- Rewrite(fo);
+ {$I+}Rewrite(fo);{$I-}
AssignFile(fohlp, 'mapdef_help.inc');
- Rewrite(fohlp);
+ {$I+}Rewrite(fohlp);{$I-}
AssignFile(foimpl, 'mapdef_impl.inc');
- Rewrite(foimpl);
+ {$I+}Rewrite(foimpl);{$I-}
write(fo, '// *** WARNING! ***'#10);
write(fo, '// regenerate this part directly from "mapdef.txt" with ''mapgen'', NEVER manually change anything here!'#10#10#10);
write(fohlp, '// regenerate this part directly from "mapdef.txt" with ''mapgen'', NEVER manually change anything here!'#10#10);
// generate trigger helpers
-{
-function TDynRecordHelper.trigTargetPoint (): TDFPoint; inline; begin result := getPointField('target'); end;
-function TDynRecordHelper.trigD2DTeleport (): Boolean; inline; begin result := (getFieldWithType('d2d', TDynField.TType.TBool).ival <> 0); end;
-function TDynRecordHelper.trigSilentTeleport (): Boolean; inline; begin result := (getFieldWithType('silent', TDynField.TType.TBool).ival <> 0); end;
-function TDynRecordHelper.trigTlpDir (): Byte; inline; begin result := Byte(getFieldWithType('direction', TDynField.TType.TUByte).ival); end;
-}
-
write(foimpl, #10#10'// ////////////////////////////////////////////////////////////////////////// //'#10);
write(foimpl, '// trigger helpers'#10);
for tidx := 0 to dfmapdef.trigTypeCount-1 do
@@ -227,7 +428,9 @@ function TDynRecordHelper.trigTlpDir (): Byte; inline; begin result := Byte(getF
end
else
begin
- raise Exception.Create('no non-separate sizes in triggers, pelase');
+ //raise Exception.Create('no non-separate sizes in triggers, pelase');
+ write(fohlp, 'function trig', palias, ' (): TDFSize; inline;'#10);
+ write(foimpl, 'function TDynRecordHelper.trig', palias, ' (): TDFSize; inline; begin result := getSizeField(''', fld.name, '''); end;'#10);
end;
end;
TDynField.TType.TList:
@@ -238,6 +441,8 @@ function TDynRecordHelper.trigTlpDir (): Byte; inline; begin result := Byte(getF
end;
end;
+ genTrigCacheVars('mapdef_tgc_def.inc');
+ genTrigLoadCache('mapdef_tgc_impl.inc');
//st := openDiskFileRO('mapdef.txt');
st.position := 0;