trigger loading now works; map loading code cleanup

[d2df-sdl.git] / src / game / g_triggers.pas

diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas
index edafecc999a259e828799a9e1d51d3bd5d59603e..064b3b6cebba673302668005eb580130f48e1789 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
@@ -27,7 +27,9 @@ type
     UID:     Word;
     TimeOut: Word;
   end;
+  PTrigger = ^TTrigger;
   TTrigger = record
+  public
     ID:               DWORD;
     ClientID:         DWORD;
     TriggerType:      Byte;
@@ -60,12 +62,17 @@ type
     ShotAmmoCount:    Word;
     ShotReloadTime:   Integer;
 
+    mapId: AnsiString; // trigger id, from map
     //trigShotPanelId: Integer;
     trigPanelId: Integer;
 
     //TrigData:             TTriggerData;
     trigData: TDynRecord; // triggerdata; owned by trigger
 
+  public
+    function trigCenter (): TDFPoint; inline;
+
+  public
     property trigShotPanelId: Integer read trigPanelId write trigPanelId;
   end;
 
@@ -113,6 +120,13 @@ const
   TRIGGER_SIGNATURE = $52475254; // 'TRGR'
   TRAP_DAMAGE = 1000;
 
+
+function TTrigger.trigCenter (): TDFPoint; inline;
+begin
+  result := TDFPoint.Create(x+width div 2, y+height div 2);
+end;
+
+
 function FindTrigger(): DWORD;
 var
   i: Integer;
@@ -2106,6 +2120,7 @@ begin
   find_id := FindTrigger();
   gTriggers[find_id] := Trigger;
 
+  {
   writeln('trigger #', find_id, ': pos=(', Trigger.x, ',', Trigger.y, ')-(', Trigger.width, 'x', Trigger.height, ')',
     '; TexturePanel=', Trigger.TexturePanel,
     '; TexturePanelType=', Trigger.TexturePanelType,
@@ -2116,6 +2131,7 @@ begin
     '; trigPanelId=', Trigger.trigPanelId,
     '; trigShotPanelId=', Trigger.trigShotPanelId
     );
+  }
 
   with gTriggers[find_id] do
   begin
@@ -2666,7 +2682,6 @@ var
 begin
   for a := 0 to High(gTriggers) do
   begin
-    gTriggers[a].trigData.Free();
     if (gTriggers[a].TriggerType = TRIGGER_SOUND) then
     begin
       if g_Sound_Exists(gTriggers[a].trigData.trigSoundName) then
@@ -2679,6 +2694,7 @@ begin
     begin
       SetLength(gTriggers[a].Activators, 0);
     end;
+    gTriggers[a].trigData.Free();
   end;
 
   gTriggers := nil;