X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=0df83bb087e16cf1c7b3fd090426c584c30669ea;hb=a4f25c41dfd783a925aa2dab4b9b84753d5c3f18;hp=22a9aee280e1d2d8295ea8191655dd3645a10936;hpb=2fa77a7c9667395ef6d4141cde69ff6349bf301e;p=d2df-sdl.git

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 22a9aee..0df83bb 100644
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -85,8 +85,6 @@ 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);
 
@@ -218,7 +216,7 @@ var
 implementation
 
 uses
-  g_main, e_log, SysUtils, g_items, g_gfx, g_console,
+  e_input, g_main, e_log, SysUtils, g_items, g_gfx, g_console,
   GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG,
   g_options, g_triggers, g_player,
   Math, g_monsters, g_saveload, g_language, g_netmsg,
@@ -2108,6 +2106,7 @@ begin
   finally
     sfsGCEnable(); // enable releasing unused volumes
     mapReader.Free();
+    e_ClearInputBuffer(); // why not?
   end;
 
   e_WriteLog('Done loading map.', MSG_NOTIFY);
@@ -3230,17 +3229,6 @@ 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;
-
 
 // trace liquid, stepping by `dx` and `dy`
 // return last seen liquid coords, and `false` if we're started outside of the liquid