X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=97c56d0c399f8682f3122caa345d79ac9a28aa05;hb=fd7ac4cd55502ecbb2a77e3f603ac0f899c1064d;hp=3b2ad4ca4d927e35096756e5ad702226b56664b2;hpb=f4fc3b435118e5d9e4085da37014436d2e063259;p=d2df-sdl.git

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 3b2ad4c..97c56d0 100644
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -252,11 +252,7 @@ var
 implementation
 
 uses
-{$IFDEF USE_NANOGL}
-  nanoGL,
-{$ELSE}
-  GL, GLExt,
-{$ENDIF}
+  {$INCLUDE ../nogl/noGLuses.inc}
   e_input, g_main, e_log, e_texture, g_items, g_gfx, g_console,
   g_weapons, g_game, g_sound, e_sound, CONFIG,
   g_options, g_triggers, g_player,
@@ -545,9 +541,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();