X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=9f9465be47c90c65f63f3cd05a639d12fe95e1e5;hp=9cc29e34dfd3e2e0db4e340896bd3d32d1b07e0d;hb=921c3b45ee6dd3b39307f4d1d6c05ab1c137bd49;hpb=6dca9a5144a2784e929d75aeeb6326d4625257b7

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 9cc29e3..9f9465b 100644
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -134,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;
 
@@ -488,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;
@@ -920,9 +919,9 @@ var
                            DoorPanel: Integer;
                            ShotPanel: Integer;
                           end;
-  FileName, mapResName, s, TexName, ScrStr: String;
-  Data, ScrText: Pointer;
-  Len, ScrLen: Integer;
+  FileName, mapResName, s, TexName: String;
+  Data: Pointer;
+  Len: Integer;
   ok, isAnim, trigRef: Boolean;
   CurTex, ntn: Integer;
 begin
@@ -953,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();