X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=35e8d46a6078d31326c79dc63af187ad03e74d17;hb=08d855c39f6bc94e9eb4f47345a506c825f8579d;hp=1ddbffdd052253d446f2163e1f4597294dd445ff;hpb=52046a296d5acd6588c2dde5918cdb6cbd26fc52;p=d2df-sdl.git

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 1ddbffd..35e8d46 100644
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -252,8 +252,9 @@ var
 implementation
 
 uses
+  {$INCLUDE ../nogl/noGLuses.inc}
   e_input, g_main, e_log, e_texture, g_items, g_gfx, g_console,
-  GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG,
+  g_weapons, g_game, g_sound, e_sound, CONFIG,
   g_options, g_triggers, g_player,
   Math, g_monsters, g_saveload, g_language, g_netmsg,
   sfs, xstreams, hashtable, wadreader,
@@ -434,17 +435,19 @@ end;
 // ////////////////////////////////////////////////////////////////////////// //
 var
   NNF_PureName: String; // Èìÿ òåêñòóðû áåç öèôð â êîíöå
+  NNF_PureExt: String; // extension postfix
   NNF_FirstNum: Integer; // ×èñëî ó íà÷àëüíîé òåêñòóðû
   NNF_CurrentNum: Integer; // Ñëåäóþùåå ÷èñëî ó òåêñòóðû
 
 
 function g_Texture_NumNameFindStart(name: String): Boolean;
 var
-  i: Integer;
+  i, j: Integer;
 
 begin
   Result := False;
   NNF_PureName := '';
+  NNF_PureExt := '';
   NNF_FirstNum := -1;
   NNF_CurrentNum := -1;
 
@@ -457,8 +460,11 @@ begin
         end
       else
         begin
+          j := i + 1;
+          while (j <= Length(name)) and (name[j] <> '.') do inc(j);
           NNF_PureName := Copy(name, 1, i);
-          Delete(name, 1, i);
+          NNF_PureExt := Copy(name, j);
+          name := Copy(name, i + 1, j - i - 1);
           Break;
         end;
     end;
@@ -482,7 +488,7 @@ begin
     Exit;
   end;
 
-  newName := NNF_PureName + IntToStr(NNF_CurrentNum);
+  newName := NNF_PureName + IntToStr(NNF_CurrentNum) + NNF_PureExt;
 
   if NNF_CurrentNum < NNF_FirstNum then
     Result := NNF_NAME_BEFORE
@@ -540,9 +546,9 @@ var
 procedure g_Map_ProfilersBegin ();
 begin
   if (profMapCollision = nil) then profMapCollision := TProfiler.Create('COLSOLID', g_profile_history_size);
-  profMapCollision.mainBegin(g_profile_collision);
+  if (profMapCollision <> nil) then profMapCollision.mainBegin(g_profile_collision);
   // create sections
-  if g_profile_collision then
+  if g_profile_collision and (profMapCollision <> nil) then
   begin
     profMapCollision.sectionBegin('*solids');
     profMapCollision.sectionEnd();
@@ -1338,6 +1344,7 @@ end;
 function CreateTrigger (amapIdx: Integer; Trigger: TDynRecord; atpanid, atrigpanid: Integer): Integer;
 var
   _trigger: TTrigger;
+  tp: TPanel;
 begin
   result := -1;
   if g_Game_IsClient and not (Trigger.TriggerType in [TRIGGER_SOUND, TRIGGER_MUSIC]) then Exit;
@@ -1356,6 +1363,12 @@ begin
     ActivateType := Trigger.ActivateType;
     Keys := Trigger.Keys;
     trigPanelGUID := atrigpanid;
+    // HACK: used in TPanel.CanChangeTexture. maybe there's a better way?
+    if TexturePanelGUID <> -1 then
+    begin
+      tp := g_Map_PanelByGUID(TexturePanelGUID);
+      if (tp <> nil) then tp.hasTexTrigger := True;
+    end;
   end;
 
   result := Integer(g_Triggers_Create(_trigger, Trigger));