X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=bbf39cb5efb7bad44613c76d9352e0cb2655b37b;hb=768ae6d7aaa02bd5076a5034dd08fc8f425ad604;hp=00f39a188463600e838906f1726e382dbf102801;hpb=d3ce22f70dfe266676a3fb95d5193238ff5b9e72;p=d2df-sdl.git

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 00f39a1..bbf39cb 100644
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -125,6 +125,12 @@ procedure g_Map_ProfilersEnd ();
 
 function g_Map_ParseMap (data: Pointer; dataLen: Integer): TDynRecord;
 
+
+function g_Map_MinX (): Integer; inline;
+function g_Map_MinY (): Integer; inline;
+function g_Map_MaxX (): Integer; inline;
+function g_Map_MaxY (): Integer; inline;
+
 const
   NNF_NO_NAME         = 0;
   NNF_NAME_BEFORE     = 1;
@@ -183,6 +189,9 @@ const
   GridTagLift = 1 shl 8; // gLifts
   GridTagBlockMon = 1 shl 9; // gBlockMon
 
+  GridTagObstacle = (GridTagStep or GridTagWall or GridTagDoor);
+  GridTagLiquid = (GridTagAcid1 or GridTagAcid2 or GridTagWater);
+
   GridDrawableMask = (GridTagBack or GridTagStep or GridTagWall or GridTagDoor or GridTagAcid1 or GridTagAcid2 or GridTagWater or GridTagFore);
 
 
@@ -241,21 +250,8 @@ const
   FLAG_SIGNATURE = $47414C46; // 'FLAG'
 
 
-{
-type
-  THashIntPanel = specialize THashBase<Integer, TPanel>;
-
-function hashNewIntPanel (): THashIntPanel;
-begin
-  result := THashIntPanel.Create(hiihash, hiiequ);
-end;
-}
-
-
 var
-  //panByGUID: THashIntPanel = nil;
   panByGUID: array of TPanel = nil;
-  //panLastGUID: Integer = 0;
 
 
 // ////////////////////////////////////////////////////////////////////////// //
@@ -266,10 +262,18 @@ begin
 end;
 
 
+// ////////////////////////////////////////////////////////////////////////// //
+function g_Map_MinX (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridX0 else result := 0; end;
+function g_Map_MinY (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridY0 else result := 0; end;
+function g_Map_MaxX (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridX0+mapGrid.gridWidth-1 else result := 0; end;
+function g_Map_MaxY (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridY0+mapGrid.gridHeight-1 else result := 0; end;
+
+
 // ////////////////////////////////////////////////////////////////////////// //
 var
   dfmapdef: TDynMapDef = nil;
 
+
 procedure loadMapDefinition ();
 var
   pr: TTextParser = nil;
@@ -277,13 +281,15 @@ var
   WAD: TWADFile = nil;
 begin
   if (dfmapdef <> nil) then exit;
+
   try
     e_LogWritefln('parsing "mapdef.txt"...', []);
     st := openDiskFileRO(DataDir+'mapdef.txt');
+    e_LogWritefln('found local "%smapdef.txt"', [DataDir]);
   except
     st := nil;
-    e_LogWritefln('local "%smapdef.txt" not found', [DataDir]);
   end;
+
   if (st = nil) then
   begin
     WAD := TWADFile.Create();
@@ -298,15 +304,22 @@ begin
     end;
   end;
 
-  if (st = nil) then
-  begin
-    //raise Exception.Create('cannot open "mapdef.txt"');
-    e_LogWritefln('using default "mapdef.txt"...', [], MSG_WARNING);
-    pr := TStrTextParser.Create(defaultMapDef);
-  end
-  else
-  begin
-    pr := TFileTextParser.Create(st);
+  try
+    if (st = nil) then
+    begin
+      //raise Exception.Create('cannot open "mapdef.txt"');
+      e_LogWriteln('using default "mapdef.txt"...');
+      pr := TStrTextParser.Create(defaultMapDef);
+    end
+    else
+    begin
+      pr := TFileTextParser.Create(st);
+    end;
+  except on e: Exception do
+    begin
+      e_LogWritefln('something is VERY wrong here! -- ', [e.message]);
+      raise;
+    end;
   end;
 
   try
@@ -328,6 +341,8 @@ var
 begin
   result := nil;
   if (dataLen < 4) then exit;
+
+  if (dfmapdef = nil) then writeln('need to load mapdef');
   loadMapDefinition();
   if (dfmapdef = nil) then raise Exception.Create('internal map loader error');
 
@@ -337,6 +352,7 @@ begin
   begin
     // binary map
     try
+      //e_LogWriteln('parsing binary map...');
       result := dfmapdef.parseBinMap(wst);
     except on e: Exception do
       begin
@@ -353,10 +369,11 @@ begin
     // text map
     pr := TFileTextParser.Create(wst);
     try
+      //e_LogWriteln('parsing text map...');
       result := dfmapdef.parseMap(pr);
     except on e: Exception do
       begin
-        if (pr <> nil) then e_LogWritefln('ERROR at (%s,%s): %s', [pr.line, pr.col, e.message])
+        if (pr <> nil) then e_LogWritefln('ERROR at (%s,%s): %s', [pr.tokLine, pr.tokCol, e.message])
         else e_LogWritefln('ERROR: %s', [e.message]);
         pr.Free(); // will free `wst`
         result := nil;
@@ -365,6 +382,7 @@ begin
     end;
     pr.Free(); // will free `wst`
   end;
+  //e_LogWriteln('map parsed.');
 end;
 
 
@@ -769,8 +787,7 @@ begin
   PanelArray := nil;
 end;
 
-function CreatePanel(PanelRec: TDynRecord; AddTextures: TAddTextureArray;
-                     CurTex: Integer; sav: Boolean): Integer;
+function CreatePanel (PanelRec: TDynRecord; AddTextures: TAddTextureArray; CurTex: Integer; sav: Boolean): Integer;
 var
   len: Integer;
   panels: ^TPanelArray;
@@ -795,20 +812,22 @@ begin
   len := Length(panels^);
   SetLength(panels^, len+1);
 
-  //Inc(panLastGUID);
   pguid := Length(panByGUID);
   SetLength(panByGUID, pguid+1); //FIXME!
   pan := TPanel.Create(PanelRec, AddTextures, CurTex, Textures, pguid);
+  assert(pguid >= 0);
+  assert(pguid < Length(panByGUID));
+  panByGUID[pguid] := pan;
   panels^[len] := pan;
   pan.arrIdx := len;
   pan.proxyId := -1;
   pan.tag := panelTypeToTag(PanelRec.PanelType);
   if sav then pan.SaveIt := True;
 
-  PanelRec.user['panel_guid'] := pan.guid;
-  //panByGUID.put(pan.guid, pan);
+  PanelRec.user['panel_guid'] := pguid;
 
-  result := len;
+  //result := len;
+  result := pguid;
 end;
 
 
@@ -1309,7 +1328,7 @@ begin
     end
     else
     begin
-      trigData := Trigger.trigRec.clone();
+      trigData := Trigger.trigRec.clone(nil);
     end;
   end;
 
@@ -1601,9 +1620,6 @@ begin
   gCurrentMap.Free();
   gCurrentMap := nil;
 
-  //panByGUID.Free();
-  //panByGUID := hashNewIntPanel();
-  //panLastGUID := 0;
   panByGUID := nil;
 
   Result := False;
@@ -1661,6 +1677,12 @@ begin
 
     FreeMem(Data);
 
+    if (mapReader = nil) then
+    begin
+      e_LogWritefln('invalid map file: ''%s''', [mapResName]);
+      exit;
+    end;
+
     generateExternalResourcesList(mapReader);
     mapTextureList := mapReader['texture'];
     // get all other lists here too
@@ -1979,10 +2001,9 @@ begin
 
         //e_LogWritefln('PANADD: pannum=%s', [pannum]);
 
-        // Ñîçäàåì ïàíåëü è çàïîìèíàåì åå íîìåð
+        // Ñîçäàåì ïàíåëü è çàïîìèíàåì åå GUID
         PanelID := CreatePanel(rec, AddTextures, CurTex, trigRef);
-        //e_LogWritefln('panel #%s of type %s got id #%s', [pannum, rec.PanelType, PanelID]);
-        // set 'gamePanelId' field to panel id
+        //e_LogWritefln('panel #%s of type %s got guid #%s', [pannum, rec.PanelType, PanelID]);
         rec.userPanelId := PanelID; // remember game panel id, we'll fix triggers later
 
         // setup lifts
@@ -2203,10 +2224,14 @@ begin
     mapReader := g_Map_ParseMap(Data, Len);
   except
     mapReader := nil;
+    FreeMem(Data);
+    exit;
   end;
 
   FreeMem(Data);
 
+  if (mapReader = nil) then exit;
+
   if (mapReader.Width > 0) and (mapReader.Height > 0) then
   begin
     Result.Name := mapReader.MapName;
@@ -2363,9 +2388,6 @@ begin
     BadTextNameHash := nil;
   end;
 
-  //panByGUID.Free();
-  //panByGUID := nil;
-  //panLastGUID := 0;
   panByGUID := nil;
 
   FreePanelArray(gWalls);
@@ -2416,6 +2438,8 @@ var
   end;
 
 begin
+  if g_dbgpan_mplat_step then g_dbgpan_mplat_active := true;
+
   UpdatePanelArray(gWalls);
   UpdatePanelArray(gRenderBackgrounds);
   UpdatePanelArray(gRenderForegrounds);
@@ -2424,24 +2448,26 @@ begin
   UpdatePanelArray(gAcid2);
   UpdatePanelArray(gSteps);
 
+  if g_dbgpan_mplat_step then begin g_dbgpan_mplat_step := false; g_dbgpan_mplat_active := false; end;
+
   if gGameSettings.GameMode = GM_CTF then
   begin
     for a := FLAG_RED to FLAG_BLUE do
+    begin
       if not (gFlags[a].State in [FLAG_STATE_NONE, FLAG_STATE_CAPTURED]) then
+      begin
         with gFlags[a] do
         begin
-          if gFlags[a].Animation <> nil then
-            gFlags[a].Animation.Update();
+          if gFlags[a].Animation <> nil then gFlags[a].Animation.Update();
 
           m := g_Obj_Move(@Obj, True, True);
 
-          if gTime mod (GAME_TICK*2) <> 0 then
-            Continue;
+          if gTime mod (GAME_TICK*2) <> 0 then Continue;
 
-        // Ñîïðîòèâëåíèå âîçäóõà:
+          // Ñîïðîòèâëåíèå âîçäóõà
           Obj.Vel.X := z_dec(Obj.Vel.X, 1);
 
-        // Òàéìàóò ïîòåðÿííîãî ôëàãà, ëèáî îí âûïàë çà êàðòó:
+          // Òàéìàóò ïîòåðÿííîãî ôëàãà, ëèáî îí âûïàë çà êàðòó
           if ((Count = 0) or ByteBool(m and MOVE_FALLOUT)) and g_Game_IsServer then
           begin
             g_Map_ResetFlag(a);
@@ -2457,30 +2483,28 @@ begin
             Continue;
           end;
 
-          if Count > 0 then
-            Count := Count - 1;
+          if Count > 0 then Count -= 1;
 
-        // Èãðîê áåðåò ôëàã:
+          // Èãðîê áåðåò ôëàã
           if gPlayers <> nil then
           begin
             j := Random(Length(gPlayers)) - 1;
-
             for d := 0 to High(gPlayers) do
             begin
               Inc(j);
-              if j > High(gPlayers) then
-                j := 0;
-
+              if j > High(gPlayers) then j := 0;
               if gPlayers[j] <> nil then
-                if gPlayers[j].Live and
-                   g_Obj_Collide(@Obj, @gPlayers[j].Obj) then
+              begin
+                if gPlayers[j].alive and g_Obj_Collide(@Obj, @gPlayers[j].Obj) then
                 begin
-                  if gPlayers[j].GetFlag(a) then
-                    Break;
+                  if gPlayers[j].GetFlag(a) then Break;
                 end;
+              end;
             end;
           end;
         end;
+      end;
+    end;
   end;
 end;
 
@@ -3049,255 +3073,210 @@ begin
       end;
 end;
 
-procedure g_Map_SaveState(Var Mem: TBinMemoryWriter);
+
+procedure g_Map_SaveState (var Mem: TBinMemoryWriter);
 var
   dw: DWORD;
   b: Byte;
   str: String;
   boo: Boolean;
 
-  procedure SavePanelArray(var panels: TPanelArray);
+  procedure savePanels ();
   var
     PAMem: TBinMemoryWriter;
-    i: Integer;
+    pan: TPanel;
   begin
-  // Ñîçäàåì íîâûé ñïèñîê ñîõðàíÿåìûõ ïàíåëåé:
-    PAMem := TBinMemoryWriter.Create((Length(panels)+1) * 40);
+    // Ñîçäàåì íîâûé ñïèñîê ñîõðàíÿåìûõ ïàíåëåé
+    PAMem := TBinMemoryWriter.Create((Length(panByGUID)+1) * 40);
 
-    i := 0;
-    while i < Length(panels) do
+    for pan in panByGUID do
     begin
-      if true{panels[i].SaveIt} then
+      if true{pan.SaveIt} then
       begin
-      // ID ïàíåëè:
-        PAMem.WriteInt(i);
-      // Ñîõðàíÿåì ïàíåëü:
-        panels[i].SaveState(PAMem);
+        // ID ïàíåëè
+        //PAMem.WriteInt(i);
+        // Ñîõðàíÿåì ïàíåëü
+        pan.SaveState(PAMem);
       end;
-      Inc(i);
     end;
 
-  // Ñîõðàíÿåì ýòîò ñïèñîê ïàíåëåé:
+    // Ñîõðàíÿåì ýòîò ñïèñîê ïàíåëåé
     PAMem.SaveToMemory(Mem);
     PAMem.Free();
   end;
 
-  procedure SaveFlag(flag: PFlag);
+  procedure SaveFlag (flag: PFlag);
   begin
-  // Ñèãíàòóðà ôëàãà:
+    // Ñèãíàòóðà ôëàãà
     dw := FLAG_SIGNATURE; // 'FLAG'
     Mem.WriteDWORD(dw);
-  // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà:
+    // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà
     Mem.WriteByte(flag^.RespawnType);
-  // Ñîñòîÿíèå ôëàãà:
+    // Ñîñòîÿíèå ôëàãà
     Mem.WriteByte(flag^.State);
-  // Íàïðàâëåíèå ôëàãà:
-    if flag^.Direction = D_LEFT then
-      b := 1
-    else // D_RIGHT
-      b := 2;
+    // Íàïðàâëåíèå ôëàãà
+    if flag^.Direction = D_LEFT then b := 1 else b := 2; // D_RIGHT
     Mem.WriteByte(b);
-  // Îáúåêò ôëàãà:
+    // Îáúåêò ôëàãà
     Obj_SaveState(@flag^.Obj, Mem);
   end;
 
 begin
   Mem := TBinMemoryWriter.Create(1024 * 1024); // 1 MB
 
-///// Ñîõðàíÿåì ñïèñêè ïàíåëåé: /////
-// Ñîõðàíÿåì ïàíåëè ñòåí è äâåðåé:
-  SavePanelArray(gWalls);
-// Ñîõðàíÿåì ïàíåëè ôîíà:
-  SavePanelArray(gRenderBackgrounds);
-// Ñîõðàíÿåì ïàíåëè ïåðåäíåãî ïëàíà:
-  SavePanelArray(gRenderForegrounds);
-// Ñîõðàíÿåì ïàíåëè âîäû:
-  SavePanelArray(gWater);
-// Ñîõðàíÿåì ïàíåëè êèñëîòû-1:
-  SavePanelArray(gAcid1);
-// Ñîõðàíÿåì ïàíåëè êèñëîòû-2:
-  SavePanelArray(gAcid2);
-// Ñîõðàíÿåì ïàíåëè ñòóïåíåé:
-  SavePanelArray(gSteps);
-// Ñîõðàíÿåì ïàíåëè ëèôòîâ:
-  SavePanelArray(gLifts);
-///// /////
-
-///// Ñîõðàíÿåì ìóçûêó: /////
-// Ñèãíàòóðà ìóçûêè:
+  ///// Ñîõðàíÿåì ñïèñêè ïàíåëåé: /////
+  savePanels();
+  ///// /////
+
+  ///// Ñîõðàíÿåì ìóçûêó: /////
+  // Ñèãíàòóðà ìóçûêè:
   dw := MUSIC_SIGNATURE; // 'MUSI'
   Mem.WriteDWORD(dw);
-// Íàçâàíèå ìóçûêè:
+  // Íàçâàíèå ìóçûêè:
   Assert(gMusic <> nil, 'g_Map_SaveState: gMusic = nil');
-  if gMusic.NoMusic then
-    str := ''
-  else
-    str := gMusic.Name;
+  if gMusic.NoMusic then str := '' else str := gMusic.Name;
   Mem.WriteString(str, 64);
-// Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè:
+  // Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè
   dw := gMusic.GetPosition();
   Mem.WriteDWORD(dw);
-// Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå:
+  // Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå
   boo := gMusic.SpecPause;
   Mem.WriteBoolean(boo);
-///// /////
+  ///// /////
 
-///// Ñîõðàíÿåì êîëè÷åñòâî ìîíñòðîâ: /////
+  ///// Ñîõðàíÿåì êîëè÷åñòâî ìîíñòðîâ: /////
   Mem.WriteInt(gTotalMonsters);
-///// /////
+  ///// /////
 
-//// Ñîõðàíÿåì ôëàãè, åñëè ýòî CTF: /////
+  //// Ñîõðàíÿåì ôëàãè, åñëè ýòî CTF: /////
   if gGameSettings.GameMode = GM_CTF then
   begin
-  // Ôëàã Êðàñíîé êîìàíäû:
+    // Ôëàã Êðàñíîé êîìàíäû
     SaveFlag(@gFlags[FLAG_RED]);
-  // Ôëàã Ñèíåé êîìàíäû:
+    // Ôëàã Ñèíåé êîìàíäû
     SaveFlag(@gFlags[FLAG_BLUE]);
   end;
-///// /////
+  ///// /////
 
-///// Ñîõðàíÿåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: /////
+  ///// Ñîõðàíÿåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: /////
   if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
   begin
-  // Î÷êè Êðàñíîé êîìàíäû:
+    // Î÷êè Êðàñíîé êîìàíäû
     Mem.WriteSmallInt(gTeamStat[TEAM_RED].Goals);
-  // Î÷êè Ñèíåé êîìàíäû:
+    // Î÷êè Ñèíåé êîìàíäû
     Mem.WriteSmallInt(gTeamStat[TEAM_BLUE].Goals);
   end;
-///// /////
+  ///// /////
 end;
 
-procedure g_Map_LoadState(Var Mem: TBinMemoryReader);
+
+procedure g_Map_LoadState (var Mem: TBinMemoryReader);
 var
   dw: DWORD;
   b: Byte;
   str: String;
   boo: Boolean;
 
-  procedure LoadPanelArray(var panels: TPanelArray);
+  procedure loadPanels ();
   var
     PAMem: TBinMemoryReader;
-    i, id: Integer;
+    pan: TPanel;
   begin
-  // Çàãðóæàåì òåêóùèé ñïèñîê ïàíåëåé:
+    // Çàãðóæàåì òåêóùèé ñïèñîê ïàíåëåé
     PAMem := TBinMemoryReader.Create();
     PAMem.LoadFromMemory(Mem);
 
-    for i := 0 to Length(panels)-1 do
+    for pan in panByGUID do
     begin
-      if true{panels[i].SaveIt} then
+      if true{pan.SaveIt} then
       begin
-      // ID ïàíåëè:
-        PAMem.ReadInt(id);
-        if id <> i then
-        begin
-          raise EBinSizeError.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel ID');
-        end;
-      // Çàãðóæàåì ïàíåëü:
-        panels[i].LoadState(PAMem);
-        if (panels[i].arrIdx <> i) then raise Exception.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel arrIdx');
-        if (panels[i].proxyId >= 0) then mapGrid.proxyEnabled[panels[i].proxyId] := panels[i].Enabled;
+        // ID ïàíåëè:
+        //PAMem.ReadInt(id);
+        {
+        if id <> i then raise EBinSizeError.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel ID');
+        }
+        // Çàãðóæàåì ïàíåëü
+        pan.LoadState(PAMem);
+        //if (panels[i].arrIdx <> i) then raise Exception.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel arrIdx');
+        if (pan.proxyId >= 0) then mapGrid.proxyEnabled[pan.proxyId] := pan.Enabled;
       end;
     end;
 
-  // Ýòîò ñïèñîê ïàíåëåé çàãðóæåí:
+    // Ýòîò ñïèñîê ïàíåëåé çàãðóæåí
     PAMem.Free();
   end;
 
   procedure LoadFlag(flag: PFlag);
   begin
-  // Ñèãíàòóðà ôëàãà:
+    // Ñèãíàòóðà ôëàãà
     Mem.ReadDWORD(dw);
-    if dw <> FLAG_SIGNATURE then // 'FLAG'
-    begin
-      raise EBinSizeError.Create('g_Map_LoadState: LoadFlag: Wrong Flag Signature');
-    end;
-  // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà:
+    // 'FLAG'
+    if dw <> FLAG_SIGNATURE then raise EBinSizeError.Create('g_Map_LoadState: LoadFlag: Wrong Flag Signature');
+    // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà
     Mem.ReadByte(flag^.RespawnType);
-  // Ñîñòîÿíèå ôëàãà:
+    // Ñîñòîÿíèå ôëàãà
     Mem.ReadByte(flag^.State);
-  // Íàïðàâëåíèå ôëàãà:
+    // Íàïðàâëåíèå ôëàãà
     Mem.ReadByte(b);
-    if b = 1 then
-      flag^.Direction := D_LEFT
-    else // b = 2
-      flag^.Direction := D_RIGHT;
-  // Îáúåêò ôëàãà:
+    if b = 1 then flag^.Direction := D_LEFT else flag^.Direction := D_RIGHT; // b = 2
+    // Îáúåêò ôëàãà
     Obj_LoadState(@flag^.Obj, Mem);
   end;
 
 begin
-  if Mem = nil then
-    Exit;
+  if Mem = nil then Exit;
+
+  ///// Çàãðóæàåì ñïèñêè ïàíåëåé: /////
+  loadPanels();
+  ///// /////
 
-///// Çàãðóæàåì ñïèñêè ïàíåëåé: /////
-// Çàãðóæàåì ïàíåëè ñòåí è äâåðåé:
-  LoadPanelArray(gWalls);
-// Çàãðóæàåì ïàíåëè ôîíà:
-  LoadPanelArray(gRenderBackgrounds);
-// Çàãðóæàåì ïàíåëè ïåðåäíåãî ïëàíà:
-  LoadPanelArray(gRenderForegrounds);
-// Çàãðóæàåì ïàíåëè âîäû:
-  LoadPanelArray(gWater);
-// Çàãðóæàåì ïàíåëè êèñëîòû-1:
-  LoadPanelArray(gAcid1);
-// Çàãðóæàåì ïàíåëè êèñëîòû-2:
-  LoadPanelArray(gAcid2);
-// Çàãðóæàåì ïàíåëè ñòóïåíåé:
-  LoadPanelArray(gSteps);
-// Çàãðóæàåì ïàíåëè ëèôòîâ:
-  LoadPanelArray(gLifts);
-///// /////
-
-// Îáíîâëÿåì êàðòó ñòîëêíîâåíèé è ñåòêó:
+  // Îáíîâëÿåì êàðòó ñòîëêíîâåíèé è ñåòêó
   g_GFX_Init();
   //mapCreateGrid();
 
-///// Çàãðóæàåì ìóçûêó: /////
-// Ñèãíàòóðà ìóçûêè:
+  ///// Çàãðóæàåì ìóçûêó: /////
+  // Ñèãíàòóðà ìóçûêè
   Mem.ReadDWORD(dw);
-  if dw <> MUSIC_SIGNATURE then // 'MUSI'
-  begin
-    raise EBinSizeError.Create('g_Map_LoadState: Wrong Music Signature');
-  end;
-// Íàçâàíèå ìóçûêè:
+  // 'MUSI'
+  if dw <> MUSIC_SIGNATURE then raise EBinSizeError.Create('g_Map_LoadState: Wrong Music Signature');
+  // Íàçâàíèå ìóçûêè
   Assert(gMusic <> nil, 'g_Map_LoadState: gMusic = nil');
   Mem.ReadString(str);
-// Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè:
+  // Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè
   Mem.ReadDWORD(dw);
-// Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå:
+  // Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå
   Mem.ReadBoolean(boo);
-// Çàïóñêàåì ýòó ìóçûêó:
+  // Çàïóñêàåì ýòó ìóçûêó
   gMusic.SetByName(str);
   gMusic.SpecPause := boo;
   gMusic.Play();
   gMusic.Pause(True);
   gMusic.SetPosition(dw);
-///// /////
+  ///// /////
 
-///// Çàãðóæàåì êîëè÷åñòâî ìîíñòðîâ: /////
+  ///// Çàãðóæàåì êîëè÷åñòâî ìîíñòðîâ: /////
   Mem.ReadInt(gTotalMonsters);
-///// /////
+  ///// /////
 
-//// Çàãðóæàåì ôëàãè, åñëè ýòî CTF: /////
+  //// Çàãðóæàåì ôëàãè, åñëè ýòî CTF: /////
   if gGameSettings.GameMode = GM_CTF then
   begin
-  // Ôëàã Êðàñíîé êîìàíäû:
+    // Ôëàã Êðàñíîé êîìàíäû
     LoadFlag(@gFlags[FLAG_RED]);
-  // Ôëàã Ñèíåé êîìàíäû:
+    // Ôëàã Ñèíåé êîìàíäû
     LoadFlag(@gFlags[FLAG_BLUE]);
   end;
-///// /////
+  ///// /////
 
-///// Çàãðóæàåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: /////
+  ///// Çàãðóæàåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: /////
   if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
   begin
-  // Î÷êè Êðàñíîé êîìàíäû:
+    // Î÷êè Êðàñíîé êîìàíäû
     Mem.ReadSmallInt(gTeamStat[TEAM_RED].Goals);
-  // Î÷êè Ñèíåé êîìàíäû:
+    // Î÷êè Ñèíåé êîìàíäû
     Mem.ReadSmallInt(gTeamStat[TEAM_BLUE].Goals);
   end;
-///// /////
+  ///// /////
 end;