X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=97c56d0c399f8682f3122caa345d79ac9a28aa05;hb=fc965d7cd1a1889f7407070f2bc19bc4ac48fd01;hp=c4e818fe319d289a38fe4f908cc609d89e085811;hpb=785fe3df9d3c82df346034780156cb63bae43ff7;p=d2df-sdl.git diff --git a/src/game/g_map.pas b/src/game/g_map.pas index c4e818f..97c56d0 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, @@ -540,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();