X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=7d9ec78b5baffe5a78bb694e1c15008af40eeb53;hb=58b15f7d5aee8dc280a2e407c11a1f0448eea7ef;hp=89511af81cd2c15fc309ba95ad06e9c2009db0c5;hpb=7292fe409145dfcbb2776e34bb64d56e32985b9d;p=d2df-sdl.git

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 89511af..7d9ec78 100644
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_window;
 
 interface
@@ -47,7 +47,8 @@ uses
 {$IFDEF WINDOWS}Windows,{$ENDIF}
   SDL2, GL, GLExt, e_graphics, e_log, g_main,
   g_console, SysUtils, e_input, g_options, g_game,
-  g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net;
+  g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
+  g_map;
 
 var
   h_Wnd: PSDL_Window;
@@ -577,6 +578,8 @@ begin
     wNeedTimeReset := False;
   end;
 
+  g_Map_ProfilersBegin();
+
   t := Time_Delta div 28{(27777 div 1000)};
   if t > 0 then
   begin
@@ -594,6 +597,8 @@ begin
     else if NetMode = NET_CLIENT then g_Net_Client_Update();
   end;
 
+  g_Map_ProfilersEnd();
+
   if wLoadingQuit then
   begin
     g_Game_Free();
@@ -703,8 +708,19 @@ begin
   begin
     if ParamStr(idx) = '--opengl-dump-exts' then gwin_dump_extensions := true;
     if ParamStr(idx) = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true;
+    if ParamStr(idx) = '--jah' then g_profile_history_size := 100;
+    if ParamStr(idx) = '--tree-draw' then gdbg_map_use_tree_draw := true;
+    if ParamStr(idx) = '--grid-draw' then gdbg_map_use_tree_draw := false;
+    if ParamStr(idx) = '--tree-coldet' then gdbg_map_use_tree_coldet := true;
+    if ParamStr(idx) = '--grid-coldet' then gdbg_map_use_tree_coldet := false;
   end;
 
+  if gdbg_map_use_tree_draw then e_WriteLog('using TREE renderer', MSG_NOTIFY);
+  if not gdbg_map_use_tree_draw then e_WriteLog('using GRID renderer', MSG_NOTIFY);
+
+  if gdbg_map_use_tree_coldet then e_WriteLog('using TREE coldet', MSG_NOTIFY);
+  if not gdbg_map_use_tree_coldet then e_WriteLog('using GRID coldet', MSG_NOTIFY);
+
   e_WriteLog('Initializing OpenGL', MSG_NOTIFY);
   InitOpenGL(gVSync);