X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame%2Fg_map.pas;h=9f9465be47c90c65f63f3cd05a639d12fe95e1e5;hb=3783830edebbddb553cbac365d0c6259e482a9ee;hp=cb934b81705666abe9dcd89ace6d7ae251fa47cb;hpb=0aed9f9d49f034aad7d8856db00fe42f3303826d;p=d2df-sdl.git

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index cb934b8..9f9465b 100644
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -55,7 +55,6 @@ type
     Direction:   TDirection;
   end;
 
-
 function  g_Map_Load(Res: String): Boolean;
 function  g_Map_GetMapInfo(Res: String): TMapInfo;
 function  g_Map_GetMapsList(WADName: String): SArray;
@@ -82,6 +81,8 @@ function  g_Map_HaveFlagPoints(): Boolean;
 procedure g_Map_ResetFlag(Flag: Byte);
 procedure g_Map_DrawFlags();
 
+function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel;
+
 procedure g_Map_SaveState(Var Mem: TBinMemoryWriter);
 procedure g_Map_LoadState(Var Mem: TBinMemoryReader);
 
@@ -133,7 +134,7 @@ uses
   GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG,
   g_options, MAPREADER, g_triggers, g_player, MAPDEF,
   Math, g_monsters, g_saveload, g_language, g_netmsg,
-  utils, sfs, g_scripts,
+  utils, sfs,
   ImagingTypes, Imaging, ImagingUtility,
   ImagingGif, ImagingNetworkGraphics;
 
@@ -142,7 +143,14 @@ const
   MUSIC_SIGNATURE = $4953554D; // 'MUSI'
   FLAG_SIGNATURE = $47414C46; // 'FLAG'
 
+type
+  TPanelID = record
+    PWhere: ^TPanelArray;
+    PArrID: Integer;
+  end;
+
 var
+  PanelById:     array of TPanelID;
   Textures:      TLevelTextureArray;
   RespawnPoints: Array of TRespawnPoint;
   FlagPoints:    Array [FLAG_RED..FLAG_BLUE] of PFlagPoint;
@@ -362,6 +370,11 @@ begin
     panels^[len].SaveIt := True;
 
   Result := len;
+
+  len := Length(PanelByID);
+  SetLength(PanelByID, len + 1);
+  PanelByID[len].PWhere := panels;
+  PanelByID[len].PArrID := Result;
 end;
 
 function CreateNullTexture(RecName: String): Integer;
@@ -475,12 +488,11 @@ function CreateAnimTexture(RecName: String; Map: string; log: Boolean): Integer;
 var
   WAD: TWADFile;
   TextureWAD: PChar = nil;
-  ttw: PChar = nil;
   TextData: Pointer = nil;
   TextureData: Pointer = nil;
   cfg: TConfig = nil;
   WADName: String;
-  ResLength, rrl: Integer;
+  ResLength: Integer;
   TextureResource: String;
   _width, _height, _framecount, _speed: Integer;
   _backanimation: Boolean;
@@ -907,10 +919,9 @@ var
                            DoorPanel: Integer;
                            ShotPanel: Integer;
                           end;
-  FileName, mapResName, s, TexName, ScrStr: String;
-  Data, ScrText: Pointer;
-  ScrEnd: PByte;
-  Len, ScrLen: Integer;
+  FileName, mapResName, s, TexName: String;
+  Data: Pointer;
+  Len: Integer;
   ok, isAnim, trigRef: Boolean;
   CurTex, ntn: Integer;
 begin
@@ -941,18 +952,6 @@ begin
       WAD.Free();
       Exit;
     end;
-    
-    // try to load the map script
-    g_Scripts_Reset(RESET_MAP);
-    ScrText := nil;
-    ScrLen := 0;
-    if WAD.GetResource('SCRIPTS/'+mapResName, ScrText, ScrLen) then
-    begin
-      g_Console_Add('SCRIPT: Found script for this map. Loading...');
-      SetString(ScrStr, ScrText, ScrLen);
-      g_Scripts_Load(ScrStr);
-      FreeMem(ScrText);
-    end;
 
     WAD.Free();
 
@@ -1586,6 +1585,8 @@ begin
 
   gDoorMap := nil;
   gLiftMap := nil;
+
+  PanelByID := nil;
 end;
 
 procedure g_Map_Update();
@@ -2301,4 +2302,15 @@ begin
 ///// /////
 end;
 
+function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel;
+var
+  Arr: TPanelArray;
+begin
+  Result := nil;
+  if (PanelID < 0) or (PanelID > High(PanelByID)) then Exit;
+  Arr := PanelByID[PanelID].PWhere^;
+  PanelArrayID := PanelByID[PanelID].PArrID;
+  Result := Addr(Arr[PanelByID[PanelID].PArrID]);
+end;
+
 end.