X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=6cd9970a59315a03cf65315942ce166ce1c6eb63;hb=4c4a0406b07cdfd5051e388e8b00f02e008ed140;hp=c56bc488529fa761b9efd506474c5e4ffc26ad73;hpb=ebb13957295d3f50ba51ff5b871310570d0d4dfe;p=d2df-sdl.git

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index c56bc48..6cd9970 100644
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -13,14 +13,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_game;
 
 interface
 
 uses
   g_basic, g_player, e_graphics, Classes, g_res_downloader,
-  SysUtils, g_sound, g_gui, MAPSTRUCT, wadreader, md5;
+  SysUtils, g_sound, g_gui, MAPSTRUCT, wadreader, md5, xprofiler;
 
 type
   TGameSettings = record
@@ -124,6 +124,7 @@ procedure GameCVars(P: SArray);
 procedure GameCommands(P: SArray);
 procedure GameCheats(P: SArray);
 procedure DebugCommands(P: SArray);
+procedure ProfilerCommands(P: SArray);
 procedure g_Game_Process_Params;
 procedure g_Game_SetLoadingText(Text: String; Max: Integer; reWrite: Boolean);
 procedure g_Game_StepLoading();
@@ -309,6 +310,11 @@ var
   P1MoveButton: Byte = 0;
   P2MoveButton: Byte = 0;
 
+  g_profile_frame_update: Boolean = false;
+  g_profile_frame_draw: Boolean = false;
+  g_profile_collision: Boolean = false;
+  g_profile_history_size: Integer = 1000;
+
 procedure g_ResetDynlights ();
 procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single);
 procedure g_DynLightExplosion (x, y, radius: Integer; r, g, b: Single);
@@ -317,13 +323,20 @@ implementation
 
 uses
   g_textures, g_main, g_window, g_menu,
-  e_input, e_log, g_console, g_items, g_map,
+  e_input, e_log, g_console, g_items, g_map, g_panel,
   g_playermodel, g_gfx, g_options, g_weapons, Math,
   g_triggers, MAPDEF, g_monsters, e_sound, CONFIG,
   BinEditor, g_language, g_net, SDL,
-  ENet, e_fixedbuffer, g_netmsg, g_netmaster, GL, GLExt,
+  ENet, e_msg, g_netmsg, g_netmaster, GL, GLExt,
   utils, sfs;
 
+
+// ////////////////////////////////////////////////////////////////////////// //
+var
+  profileFrameDraw: TProfiler = nil;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
 type
   TDynLight = record
     x, y, radius: Integer;
@@ -341,6 +354,7 @@ procedure g_ResetDynlights ();
 var
   lnum, idx: Integer;
 begin
+  if not gwin_has_stencil then begin g_dynLightCount := 0; exit; end;
   lnum := 0;
   for idx := 0 to g_dynLightCount-1 do
   begin
@@ -367,6 +381,7 @@ end;
 
 procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single);
 begin
+  if not gwin_has_stencil then exit;
   if g_dynLightCount = length(g_dynLights) then SetLength(g_dynLights, g_dynLightCount+1024);
   g_dynLights[g_dynLightCount].x := x;
   g_dynLights[g_dynLightCount].y := y;
@@ -381,6 +396,7 @@ end;
 
 procedure g_DynLightExplosion (x, y, radius: Integer; r, g, b: Single);
 begin
+  if not gwin_has_stencil then exit;
   if g_dynLightCount = length(g_dynLights) then SetLength(g_dynLights, g_dynLightCount+1024);
   g_dynLights[g_dynLightCount].x := x;
   g_dynLights[g_dynLightCount].y := y;
@@ -394,6 +410,46 @@ begin
   Inc(g_dynLightCount);
 end;
 
+
+// ////////////////////////////////////////////////////////////////////////// //
+function calcProfilesHeight (prof: TProfiler): Integer;
+begin
+  result := 0;
+  if (prof = nil) then exit;
+  if (length(prof.bars) = 0) then exit;
+  result := length(prof.bars)*(16+2);
+end;
+
+// returns width
+function drawProfiles (x, y: Integer; prof: TProfiler): Integer;
+var
+  wdt, hgt: Integer;
+  yy: Integer;
+  ii: Integer;
+begin
+  result := 0;
+  if (prof = nil) then exit;
+  // gScreenWidth
+  if (length(prof.bars) = 0) then exit;
+  wdt := 192;
+  hgt := calcProfilesHeight(prof);
+  if (x < 0) then x := gScreenWidth-(wdt-1)+x;
+  if (y < 0) then y := gScreenHeight-(hgt-1)+y;
+  // background
+  //e_DrawFillQuad(x, y, x+wdt-1, y+hgt-1, 255, 255, 255, 200, B_BLEND);
+  e_DrawFillQuad(x, y, x+wdt-1, y+hgt-1, 20, 20, 20, 0, B_NONE);
+  // title
+  yy := y+2;
+  for ii := 0 to High(prof.bars) do
+  begin
+    e_TextureFontPrintEx(x+2+4*prof.bars[ii].level, yy, Format('%s: %d', [prof.bars[ii].name, prof.bars[ii].value]), gStdFont, 255, 255, 0, 1, false);
+    Inc(yy, 16+2);
+  end;
+  result := wdt;
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
 type
   TEndCustomGameStat = record
     PlayerStat: TPlayerStatArray;
@@ -1361,16 +1417,19 @@ begin
   end;
 
   // HACK: add dynlight here
-  if e_KeyPressed(IK_F8) and gGameOn and (not gConsoleShow) and (g_ActiveWindow = nil) then
-  begin
-    g_playerLight := true;
-  end;
-  if e_KeyPressed(IK_F9) and gGameOn and (not gConsoleShow) and (g_ActiveWindow = nil) then
+  if gwin_k8_enable_light_experiments then
   begin
-    g_playerLight := false;
+    if e_KeyPressed(IK_F8) and gGameOn and (not gConsoleShow) and (g_ActiveWindow = nil) then
+    begin
+      g_playerLight := true;
+    end;
+    if e_KeyPressed(IK_F9) and gGameOn and (not gConsoleShow) and (g_ActiveWindow = nil) then
+    begin
+      g_playerLight := false;
+    end;
   end;
 
-  if (g_playerLight) then g_AddDynLight(plr.GameX+32, plr.GameY+40, 128, 1, 1, 0, 0.6);
+  if gwin_has_stencil and g_playerLight then g_AddDynLight(plr.GameX+32, plr.GameY+40, 128, 1, 1, 0, 0.6);
 end;
 
 procedure g_Game_Update();
@@ -1380,6 +1439,24 @@ var
   a: Byte;
   w: Word;
   i, b: Integer;
+
+  function sendMonsPos (mon: TMonster): Boolean;
+  begin
+    result := false; // don't stop
+    if (mon.MonsterType = MONSTER_BARREL) then
+    begin
+      if (mon.GameVelX <> 0) or (mon.GameVelY <> 0) then MH_SEND_MonsterPos(mon.UID);
+    end
+    else
+      if (mon.MonsterState <> MONSTATE_SLEEP) then
+      begin
+        if (mon.MonsterState <> MONSTATE_DEAD) or (mon.GameVelX <> 0) or (mon.GameVelY <> 0) then
+        begin
+          MH_SEND_MonsterPos(mon.UID);
+        end;
+      end;
+  end;
+
 begin
   g_ResetDynlights();
 // Ïîðà âûêëþ÷àòü èãðó:
@@ -1749,22 +1826,7 @@ begin
           if gPlayers[I] <> nil then
             MH_SEND_PlayerPos(True, gPlayers[I].UID);
 
-        if gMonsters <> nil then
-          for I := 0 to High(gMonsters) do
-            if gMonsters[I] <> nil then
-            begin
-              if (gMonsters[I].MonsterType = MONSTER_BARREL) then
-              begin
-                if (gMonsters[I].GameVelX <> 0) or (gMonsters[I].GameVelY <> 0) then
-                  MH_SEND_MonsterPos(gMonsters[I].UID);
-              end
-              else
-                if (gMonsters[I].MonsterState <> MONSTATE_SLEEP) then
-                  if (gMonsters[I].MonsterState <> MONSTATE_DEAD) or
-                     (gMonsters[I].GameVelX <> 0) or
-                     (gMonsters[I].GameVelY <> 0) then
-                  MH_SEND_MonsterPos(gMonsters[I].UID);
-            end;
+        g_Mons_ForEach(sendMonsPos);
 
         NetTimeToReliable := 0;
         NetTimeToUpdate := NetUpdateRate;
@@ -1776,22 +1838,7 @@ begin
             if gPlayers[I] <> nil then
               MH_SEND_PlayerPos(False, gPlayers[I].UID);
 
-        if gMonsters <> nil then
-          for I := 0 to High(gMonsters) do
-            if gMonsters[I] <> nil then
-            begin
-              if (gMonsters[I].MonsterType = MONSTER_BARREL) then
-              begin
-                if (gMonsters[I].GameVelX <> 0) or (gMonsters[I].GameVelY <> 0) then
-                  MH_SEND_MonsterPos(gMonsters[I].UID);
-              end
-              else
-                if (gMonsters[I].MonsterState <> MONSTATE_SLEEP) then
-                  if (gMonsters[I].MonsterState <> MONSTATE_DEAD) or
-                     (gMonsters[I].GameVelX <> 0) or
-                     (gMonsters[I].GameVelY <> 0) then
-                  MH_SEND_MonsterPos(gMonsters[I].UID);
-            end;
+        g_Mons_ForEach(sendMonsPos);
 
         NetTimeToUpdate := 0;
       end;
@@ -2394,6 +2441,28 @@ end;
 procedure DrawMinimap(p: TPlayer; RenderRect: e_graphics.TRect);
 var
   a, aX, aY, aX2, aY2, Scale, ScaleSz: Integer;
+
+  function monDraw (mon: TMonster): Boolean;
+  begin
+    result := false; // don't stop
+    with mon do
+    begin
+      if Live then
+      begin
+        // Ëåâûé âåðõíèé óãîë
+        aX := Obj.X div ScaleSz + 1;
+        aY := Obj.Y div ScaleSz + 1;
+        // Ðàçìåðû
+        aX2 := max(Obj.Rect.Width div ScaleSz, 1);
+        aY2 := max(Obj.Rect.Height div ScaleSz, 1);
+        // Ïðàâûé íèæíèé óãîë
+        aX2 := aX + aX2 - 1;
+        aY2 := aY + aY2 - 1;
+        e_DrawFillQuad(aX, aY, aX2, aY2, 255, 255, 0, 0);
+      end;
+    end;
+  end;
+
 begin
   if (gMapInfo.Width > RenderRect.Right - RenderRect.Left) or
      (gMapInfo.Height > RenderRect.Bottom - RenderRect.Top) then
@@ -2562,29 +2631,173 @@ begin
               end;
           end;
     end;
-    if gMonsters <> nil then
-    begin
-    // Ðèñóåì ìîíñòðîâ:
-      for a := 0 to High(gMonsters) do
-        if gMonsters[a] <> nil then with gMonsters[a] do
-          if Live then begin
-          // Ëåâûé âåðõíèé óãîë:
-            aX := Obj.X div ScaleSz + 1;
-            aY := Obj.Y div ScaleSz + 1;
-          // Ðàçìåðû:
-            aX2 := max(Obj.Rect.Width div ScaleSz, 1);
-            aY2 := max(Obj.Rect.Height div ScaleSz, 1);
-          // Ïðàâûé íèæíèé óãîë:
-            aX2 := aX + aX2 - 1;
-            aY2 := aY + aY2 - 1;
+    // Ðèñóåì ìîíñòðîâ
+    g_Mons_ForEach(monDraw);
+  end;
+end;
 
-            e_DrawFillQuad(aX, aY, aX2, aY2, 255, 255, 0, 0);
-          end;
+
+// setup sX, sY, sWidth, sHeight, and transformation matrix before calling this!
+procedure renderDynLightsInternal ();
+var
+  lln: Integer;
+  lx, ly, lrad: Integer;
+begin
+  //TODO: lights should be in separate grid, i think
+  //      but on the other side: grid may be slower for dynlights, as their lifetime is short
+  if not gwin_has_stencil or (g_dynLightCount < 1) then exit;
+
+  // setup OpenGL parameters
+  glStencilMask($FFFFFFFF);
+  glStencilFunc(GL_ALWAYS, 0, $FFFFFFFF);
+  glEnable(GL_STENCIL_TEST);
+  glEnable(GL_SCISSOR_TEST);
+  glClear(GL_STENCIL_BUFFER_BIT);
+  glStencilFunc(GL_EQUAL, 0, $ff);
+
+  for lln := 0 to g_dynLightCount-1 do
+  begin
+    lx := g_dynLights[lln].x;
+    ly := g_dynLights[lln].y;
+    lrad := g_dynLights[lln].radius;
+    if lrad < 3 then continue;
+
+    if lx-sX+lrad < 0 then continue;
+    if ly-sY+lrad < 0 then continue;
+    if lx-sX-lrad >= gPlayerScreenSize.X then continue;
+    if ly-sY-lrad >= gPlayerScreenSize.Y then continue;
+
+    // set scissor to optimize drawing
+    glScissor((lx-sX)-lrad+2, gPlayerScreenSize.Y-(ly-sY)-lrad-1+2, lrad*2-4, lrad*2-4);
+    // no need to clear stencil buffer, light blitting will do it for us
+    glStencilOp(GL_KEEP, GL_KEEP, GL_INCR);
+    // draw extruded panels
+    glDisable(GL_TEXTURE_2D);
+    glDisable(GL_BLEND);
+    glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); // no need to modify color buffer
+    if (lrad > 4) then g_Map_DrawPanelShadowVolumes(lx, ly, lrad);
+    // render light texture
+    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); // modify color buffer
+    glStencilOp(GL_ZERO, GL_ZERO, GL_ZERO); // draw light, and clear stencil buffer
+    // blend it
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glEnable(GL_TEXTURE_2D);
+    // color and opacity
+    glColor4f(g_dynLights[lln].r, g_dynLights[lln].g, g_dynLights[lln].b, g_dynLights[lln].a);
+    glBindTexture(GL_TEXTURE_2D, g_Texture_Light());
+    glBegin(GL_QUADS);
+      glTexCoord2f(0.0, 0.0); glVertex2i(lx-lrad, ly-lrad); // top-left
+      glTexCoord2f(1.0, 0.0); glVertex2i(lx+lrad, ly-lrad); // top-right
+      glTexCoord2f(1.0, 1.0); glVertex2i(lx+lrad, ly+lrad); // bottom-right
+      glTexCoord2f(0.0, 1.0); glVertex2i(lx-lrad, ly+lrad); // bottom-left
+    glEnd();
+  end;
+
+  // done
+  glDisable(GL_STENCIL_TEST);
+  glDisable(GL_BLEND);
+  glDisable(GL_SCISSOR_TEST);
+  glScissor(0, 0, sWidth, sHeight);
+end;
+
+
+// setup sX, sY, sWidth, sHeight, and transformation matrix before calling this!
+// WARNING! this WILL CALL `glTranslatef()`, but won't restore matrices!
+procedure renderMapInternal (backXOfs, backYOfs: Integer; transX, transY: Integer; setTransMatrix: Boolean);
+type
+  TDrawCB = procedure ();
+
+  procedure drawPanelType (profname: AnsiString; panType: DWord);
+  var
+    tagmask: Integer;
+    pan: TPanel;
+  begin
+    profileFrameDraw.sectionBegin(profname);
+    if gdbg_map_use_accel_render then
+    begin
+      tagmask := panelTypeToTag(panType);
+      {$IF TRUE}
+      while (gDrawPanelList.count > 0) do
+      begin
+        pan := TPanel(gDrawPanelList.front());
+        if ((pan.tag and tagmask) = 0) then break;
+        pan.Draw();
+        gDrawPanelList.popFront();
+      end;
+      {$ELSE}
+      e_WriteLog(Format('=== PANELS: %d ===', [gDrawPanelList.count]), MSG_NOTIFY);
+      while (gDrawPanelList.count > 0) do
+      begin
+        pan := TPanel(gDrawPanelList.front());
+        e_WriteLog(Format('tagmask: 0x%04x; pan.tag: 0x%04x; pan.arrIdx: %d', [tagmask, pan.tag, pan.arrIdx]), MSG_NOTIFY);
+        pan.Draw();
+        gDrawPanelList.popFront();
+      end;
+      {$ENDIF}
+    end
+    else
+    begin
+      g_Map_DrawPanels(panType);
     end;
+    profileFrameDraw.sectionEnd();
   end;
+
+  procedure drawOther (profname: AnsiString; cb: TDrawCB);
+  begin
+    profileFrameDraw.sectionBegin(profname);
+    if assigned(cb) then cb();
+    profileFrameDraw.sectionEnd();
+  end;
+
+begin
+  profileFrameDraw.sectionBegin('total');
+
+  // our accelerated renderer will collect all panels to gDrawPanelList
+  // we can use panel tag to render level parts (see GridTagXXX in g_map.pas)
+  profileFrameDraw.sectionBegin('collect');
+  if gdbg_map_use_accel_render then
+  begin
+    g_Map_CollectDrawPanels(sX, sY, sWidth, sHeight);
+  end;
+  profileFrameDraw.sectionEnd();
+
+  profileFrameDraw.sectionBegin('skyback');
+  g_Map_DrawBack(backXOfs, backYOfs);
+  profileFrameDraw.sectionEnd();
+
+  if (setTransMatrix) then glTranslatef(transX, transY, 0);
+
+  drawPanelType('*back', PANEL_BACK);
+  drawPanelType('*step', PANEL_STEP);
+  drawOther('items', @g_Items_Draw);
+  drawOther('weapons', @g_Weapon_Draw);
+  drawOther('shells', @g_Player_DrawShells);
+  drawOther('drawall', @g_Player_DrawAll);
+  drawOther('corpses', @g_Player_DrawCorpses);
+  drawPanelType('*wall', PANEL_WALL);
+  drawOther('monsters', @g_Monsters_Draw);
+  drawPanelType('*door', PANEL_CLOSEDOOR);
+  drawOther('gfx', @g_GFX_Draw);
+  drawOther('flags', @g_Map_DrawFlags);
+  drawPanelType('*acid1', PANEL_ACID1);
+  drawPanelType('*acid2', PANEL_ACID2);
+  drawPanelType('*water', PANEL_WATER);
+  drawOther('dynlights', @renderDynLightsInternal);
+  drawPanelType('*fore', PANEL_FORE);
+
+  if g_debug_HealthBar then
+  begin
+    g_Monsters_DrawHealth();
+    g_Player_DrawHealth();
+  end;
+
+  profileFrameDraw.mainEnd(); // map rendering
 end;
 
+
 procedure DrawMapView(x, y, w, h: Integer);
+
 var
   bx, by: Integer;
 begin
@@ -2592,48 +2805,23 @@ begin
 
   bx := Round(x/(gMapInfo.Width - w)*(gBackSize.X - w));
   by := Round(y/(gMapInfo.Height - h)*(gBackSize.Y - h));
-  g_Map_DrawBack(-bx, -by);
 
   sX := x;
   sY := y;
   sWidth := w;
   sHeight := h;
 
-  glTranslatef(-x, -y, 0);
-
-  g_Map_BuildPVP(sX, sY, sX+sWidth-1, sY+sHeight-1);
-  g_Map_DrawPanels(PANEL_BACK);
-  g_Map_DrawPanels(PANEL_STEP);
-  g_Items_Draw();
-  g_Weapon_Draw();
-  g_Player_DrawShells();
-  g_Player_DrawAll();
-  g_Player_DrawCorpses();
-  g_Map_DrawPanels(PANEL_WALL);
-  g_Monsters_Draw();
-  g_Map_DrawPanels(PANEL_CLOSEDOOR);
-  g_GFX_Draw();
-  g_Map_DrawFlags();
-  g_Map_DrawPanels(PANEL_ACID1);
-  g_Map_DrawPanels(PANEL_ACID2);
-  g_Map_DrawPanels(PANEL_WATER);
-  g_Map_DrawPanels(PANEL_FORE);
-  if g_debug_HealthBar then
-  begin
-    g_Monsters_DrawHealth();
-    g_Player_DrawHealth();
-  end;
-  g_Map_ResetPVP();
+  renderMapInternal(-bx, -by, -x, -y, true);
 
   glPopMatrix();
 end;
 
+
 procedure DrawPlayer(p: TPlayer);
 var
   px, py, a, b, c, d: Integer;
   //R: TRect;
-  lln: Integer;
-  lx, ly, lrad: Integer;
+
 begin
   if (p = nil) or (p.FDummy) then
   begin
@@ -2643,6 +2831,9 @@ begin
     Exit;
   end;
 
+  if (profileFrameDraw = nil) then profileFrameDraw := TProfiler.Create('RENDER', g_profile_history_size);
+  profileFrameDraw.mainBegin(g_profile_frame_draw);
+
   gPlayerDrawn := p;
 
   glPushMatrix();
@@ -2650,149 +2841,60 @@ begin
   px := p.GameX + PLAYER_RECT_CX;
   py := p.GameY + PLAYER_RECT_CY;
 
-  if px > (gPlayerScreenSize.X div 2) then
-    a := -px + (gPlayerScreenSize.X div 2)
-  else
-    a := 0;
-  if py > (gPlayerScreenSize.Y div 2) then
-    b := -py + (gPlayerScreenSize.Y div 2)
-  else
-    b := 0;
-  if px > (gMapInfo.Width - (gPlayerScreenSize.X div 2)) then
-    a := -gMapInfo.Width + gPlayerScreenSize.X;
-  if py > (gMapInfo.Height - (gPlayerScreenSize.Y div 2)) then
-    b := -gMapInfo.Height + gPlayerScreenSize.Y;
-  if gMapInfo.Width <= gPlayerScreenSize.X then
-    a := 0;
-  if gMapInfo.Height <= gPlayerScreenSize.Y then
-    b := 0;
+  if px > (gPlayerScreenSize.X div 2) then a := -px+(gPlayerScreenSize.X div 2) else a := 0;
+  if py > (gPlayerScreenSize.Y div 2) then b := -py+(gPlayerScreenSize.Y div 2) else b := 0;
+
+  if px > gMapInfo.Width-(gPlayerScreenSize.X div 2) then a := -gMapInfo.Width+gPlayerScreenSize.X;
+  if py > gMapInfo.Height-(gPlayerScreenSize.Y div 2) then b := -gMapInfo.Height+gPlayerScreenSize.Y;
+
+  if gMapInfo.Width <= gPlayerScreenSize.X then a := 0;
+  if gMapInfo.Height <= gPlayerScreenSize.Y then b := 0;
 
   if p.IncCam <> 0 then
   begin
-    if py > (gMapInfo.Height - (gPlayerScreenSize.Y div 2)) then
+    if py > gMapInfo.Height-(gPlayerScreenSize.Y div 2) then
     begin
       if p.IncCam > 120-(py-(gMapInfo.Height-(gPlayerScreenSize.Y div 2))) then
+      begin
         p.IncCam := 120-(py-(gMapInfo.Height-(gPlayerScreenSize.Y div 2)));
+      end;
     end;
 
-    if py < (gPlayerScreenSize.Y div 2) then
+    if py < gPlayerScreenSize.Y div 2 then
     begin
       if p.IncCam < -120+((gPlayerScreenSize.Y div 2)-py) then
+      begin
         p.IncCam := -120+((gPlayerScreenSize.Y div 2)-py);
+      end;
     end;
 
     if p.IncCam < 0 then
-      while (py+(gPlayerScreenSize.Y div 2)-p.IncCam > gMapInfo.Height) and
-            (p.IncCam < 0) do
-        p.IncCam := p.IncCam + 1;
+    begin
+      while (py+(gPlayerScreenSize.Y div 2)-p.IncCam > gMapInfo.Height) and (p.IncCam < 0) do p.IncCam := p.IncCam+1; //Inc(p.IncCam);
+    end;
 
     if p.IncCam > 0 then
-      while (py-(gPlayerScreenSize.Y div 2)-p.IncCam < 0) and
-            (p.IncCam > 0) do
-        p.IncCam := p.IncCam - 1;
+    begin
+      while (py-(gPlayerScreenSize.Y div 2)-p.IncCam < 0) and (p.IncCam > 0) do p.IncCam := p.IncCam-1; //Dec(p.IncCam);
+    end;
   end;
 
-  if (px< gPlayerScreenSize.X div 2) or
-     (gMapInfo.Width-gPlayerScreenSize.X <= 256) then
-    c := 0
-  else
-    if (px > gMapInfo.Width-(gPlayerScreenSize.X div 2)) then
-      c := gBackSize.X - gPlayerScreenSize.X
-    else
-      c := Round((px-(gPlayerScreenSize.X div 2))/(gMapInfo.Width-gPlayerScreenSize.X)*(gBackSize.X-gPlayerScreenSize.X));
-
-  if (py-p.IncCam <= gPlayerScreenSize.Y div 2) or
-     (gMapInfo.Height-gPlayerScreenSize.Y <= 256) then
-    d := 0
-  else
-    if (py-p.IncCam >= gMapInfo.Height-(gPlayerScreenSize.Y div 2)) then
-      d := gBackSize.Y - gPlayerScreenSize.Y
-    else
-      d := Round((py-p.IncCam-(gPlayerScreenSize.Y div 2))/(gMapInfo.Height-gPlayerScreenSize.Y)*(gBackSize.Y-gPlayerScreenSize.Y));
+       if (px < gPlayerScreenSize.X div 2) or (gMapInfo.Width-gPlayerScreenSize.X <= 256) then c := 0
+  else if (px > gMapInfo.Width-(gPlayerScreenSize.X div 2)) then c := gBackSize.X-gPlayerScreenSize.X
+  else c := round((px-(gPlayerScreenSize.X div 2))/(gMapInfo.Width-gPlayerScreenSize.X)*(gBackSize.X-gPlayerScreenSize.X));
 
-  g_Map_DrawBack(-c, -d);
+       if (py-p.IncCam <= gPlayerScreenSize.Y div 2) or (gMapInfo.Height-gPlayerScreenSize.Y <= 256) then d := 0
+  else if (py-p.IncCam >= gMapInfo.Height-(gPlayerScreenSize.Y div 2)) then d := gBackSize.Y-gPlayerScreenSize.Y
+  else d := round((py-p.IncCam-(gPlayerScreenSize.Y div 2))/(gMapInfo.Height-gPlayerScreenSize.Y)*(gBackSize.Y-gPlayerScreenSize.Y));
 
   sX := -a;
   sY := -(b+p.IncCam);
   sWidth := gPlayerScreenSize.X;
   sHeight := gPlayerScreenSize.Y;
 
-  glTranslatef(a, b+p.IncCam, 0);
-
-  g_Map_BuildPVP(sX, sY, sX+sWidth-1, sY+sHeight-1);
-
-  g_Map_DrawPanels(PANEL_BACK);
-  g_Map_DrawPanels(PANEL_STEP);
-  g_Items_Draw();
-  g_Weapon_Draw();
-  g_Player_DrawShells();
-  g_Player_DrawAll();
-  g_Player_DrawCorpses();
-  g_Map_DrawPanels(PANEL_WALL);
-  g_Monsters_Draw();
-  g_Map_DrawPanels(PANEL_CLOSEDOOR);
-  g_GFX_Draw();
-  g_Map_DrawFlags();
-  g_Map_DrawPanels(PANEL_ACID1);
-  g_Map_DrawPanels(PANEL_ACID2);
-  g_Map_DrawPanels(PANEL_WATER);
-  g_Map_DrawPanels(PANEL_FORE);
-  if g_debug_HealthBar then
-  begin
-    g_Monsters_DrawHealth();
-    g_Player_DrawHealth();
-  end;
+  //glTranslatef(a, b+p.IncCam, 0);
 
-  if gwin_has_stencil and (g_dynLightCount > 0) then
-  begin
-    // setup OpenGL parameters
-    glStencilMask($FFFFFFFF);
-    glStencilFunc(GL_ALWAYS, 0, $FFFFFFFF);
-    glEnable(GL_STENCIL_TEST);
-    //!glEnable(GL_SCISSOR_TEST);
-    //glClear(GL_STENCIL_BUFFER_BIT);
-    glStencilFunc(GL_EQUAL, 0, $ff);
-
-    for lln := 0 to g_dynLightCount-1 do
-    begin
-      lx := g_dynLights[lln].x;
-      ly := g_dynLights[lln].y;
-      lrad := g_dynLights[lln].radius;
-      if lrad < 2 then continue;
-      // set scissor to optimize drawing
-      //!glScissor((lx-cameraOfsX)-lrad+2, v_height-(ly-cameraOfsY)-lrad-1+2, lrad*2-4, lrad*2-4);
-      // clear stencil buffer
-      glClear(GL_STENCIL_BUFFER_BIT); //!!!
-      glStencilOp(GL_KEEP, GL_KEEP, GL_INCR);
-      // draw extruded panels
-      glDisable(GL_TEXTURE_2D);
-      glDisable(GL_BLEND);
-      glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); // no need to modify color buffer
-      if (lrad > 4) then g_Map_DrawPanelShadowVolumes(lx, ly, lrad);
-      // render light texture
-      glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); // modify color buffer
-      //glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
-      glStencilOp(GL_ZERO, GL_ZERO, GL_ZERO); // draw light, and clear stencil buffer
-      // blend it
-      glEnable(GL_BLEND);
-      glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-      glEnable(GL_TEXTURE_2D);
-      // color and opacity
-      glColor4f(g_dynLights[lln].r, g_dynLights[lln].g, g_dynLights[lln].b, g_dynLights[lln].a);
-      glBindTexture(GL_TEXTURE_2D, g_Texture_Light());
-      glBegin(GL_QUADS);
-        glTexCoord2f(0.0, 0.0); glVertex2i(lx-lrad, ly-lrad); // top-left
-        glTexCoord2f(1.0, 0.0); glVertex2i(lx+lrad, ly-lrad); // top-right
-        glTexCoord2f(1.0, 1.0); glVertex2i(lx+lrad, ly+lrad); // bottom-right
-        glTexCoord2f(0.0, 1.0); glVertex2i(lx-lrad, ly+lrad); // bottom-left
-      glEnd();
-    end;
-    // done
-    glDisable(GL_STENCIL_TEST);
-    glDisable(GL_BLEND);
-    glDisable(GL_SCISSOR_TEST);
-    //!glScissor((lx-cameraOfsX)-radius+2, v_height-(ly-cameraOfsY)-radius-1+2, radius*2-4, radius*2-4);
-  end;
+  renderMapInternal(-c, -d, a, b+p.IncCam, true);
 
   if p.FSpectator then
     e_TextureFontPrintEx(p.GameX + PLAYER_RECT_CX - 4,
@@ -2817,7 +2919,6 @@ begin
   }
 
   glPopMatrix();
-  g_Map_ResetPVP();
 
   p.DrawPain();
   p.DrawPickup();
@@ -2828,6 +2929,14 @@ begin
   p.DrawGUI();
 end;
 
+procedure drawProfilers ();
+var
+  px: Integer = -1;
+begin
+  if g_profile_frame_draw then px := px-drawProfiles(px, -1, profileFrameDraw);
+  if g_profile_collision then px := px-drawProfiles(px, -1, profMapCollision);
+end;
+
 procedure g_Game_Draw();
 var
   ID: DWORD;
@@ -3149,6 +3258,8 @@ begin
   e_TextureFontPrint(gScreenWidth-72, 0,
                      Format('%d:%.2d:%.2d', [gTime div 1000 div 3600, (gTime div 1000 div 60) mod 60, gTime div 1000 mod 60]),
                      gStdFont);
+
+  if gGameOn then drawProfilers();
 end;
 
 procedure g_Game_Quit();
@@ -3187,8 +3298,12 @@ begin
 end;
 
 procedure g_Game_SetupScreenSize();
+const
+  RES_FACTOR = 4.0 / 3.0;
 var
-  d: Single;
+  s: Single;
+  rf: Single;
+  bw, bh: Word;
 begin
 // Ðàçìåð ýêðàíîâ èãðîêîâ:
   gPlayerScreenSize.X := gScreenWidth-196;
@@ -3200,14 +3315,24 @@ begin
 // Ðàçìåð çàäíåãî ïëàíà:
   if BackID <> DWORD(-1) then
   begin
-    d := SKY_STRETCH;
-
-    if (gScreenWidth*d > gMapInfo.Width) or
-       (gScreenHeight*d > gMapInfo.Height) then
-      d := 1.0;
-
-    gBackSize.X := Round(gScreenWidth*d);
-    gBackSize.Y := Round(gScreenHeight*d);
+    s := SKY_STRETCH;
+    if (gScreenWidth*s > gMapInfo.Width) or
+       (gScreenHeight*s > gMapInfo.Height) then
+    begin
+      gBackSize.X := gScreenWidth;
+      gBackSize.Y := gScreenHeight;
+    end
+    else
+    begin
+      e_GetTextureSize(BackID, @bw, @bh);
+      rf := Single(bw) / Single(bh);
+      if (rf > RES_FACTOR) then bw := Round(Single(bh) * RES_FACTOR)
+      else if (rf < RES_FACTOR) then bh := Round(Single(bw) / RES_FACTOR);
+      s := Max(gScreenWidth / bw, gScreenHeight / bh);
+      if (s < 1.0) then s := 1.0;
+      gBackSize.X := Round(bw*s);
+      gBackSize.Y := Round(bh*s);
+    end;
   end;
 end;
 
@@ -3629,6 +3754,7 @@ var
   State: Byte;
   OuterLoop: Boolean;
   newResPath: string;
+  InMsg: TMsg;
 begin
   g_Game_Free();
 
@@ -3676,27 +3802,28 @@ begin
       if (NetEvent.kind = ENET_EVENT_TYPE_RECEIVE) then
       begin
         Ptr := NetEvent.packet^.data;
-        e_Raw_Seek(0);
+        if not InMsg.Init(Ptr, NetEvent.packet^.dataLength, True) then
+          continue;
 
-        MID := e_Raw_Read_Byte(Ptr);
+        MID := InMsg.ReadByte();
 
         if (MID = NET_MSG_INFO) and (State = 0) then
         begin
-          NetMyID := e_Raw_Read_Byte(Ptr);
-          NetPlrUID1 := e_Raw_Read_Word(Ptr);
+          NetMyID := InMsg.ReadByte();
+          NetPlrUID1 := InMsg.ReadWord();
 
-          WadName := e_Raw_Read_String(Ptr);
-          Map := e_Raw_Read_String(Ptr);
+          WadName := InMsg.ReadString();
+          Map := InMsg.ReadString();
 
-          gWADHash := e_Raw_Read_MD5(Ptr);
+          gWADHash := InMsg.ReadMD5();
 
-          gGameSettings.GameMode := e_Raw_Read_Byte(Ptr);
+          gGameSettings.GameMode := InMsg.ReadByte();
           gSwitchGameMode := gGameSettings.GameMode;
-          gGameSettings.GoalLimit := e_Raw_Read_Word(Ptr);
-          gGameSettings.TimeLimit := e_Raw_Read_Word(Ptr);
-          gGameSettings.MaxLives := e_Raw_Read_Byte(Ptr);
-          gGameSettings.Options := e_Raw_Read_LongWord(Ptr);
-          T := e_Raw_Read_LongWord(Ptr);
+          gGameSettings.GoalLimit := InMsg.ReadWord();
+          gGameSettings.TimeLimit := InMsg.ReadWord();
+          gGameSettings.MaxLives := InMsg.ReadByte();
+          gGameSettings.Options := InMsg.ReadLongWord();
+          T := InMsg.ReadLongWord();
 
           newResPath := g_Res_SearchSameWAD(MapsDir, WadName, gWADHash);
           if newResPath = '' then
@@ -4057,6 +4184,13 @@ end;
 procedure g_Game_RestartRound(NoMapRestart: Boolean = False);
 var
   i, n, nb, nr: Integer;
+
+  function monRespawn (mon: TMonster): Boolean;
+  begin
+    result := false; // don't stop
+    if not mon.FNoRespawn then mon.Respawn();
+  end;
+
 begin
   if not g_Game_IsServer then Exit;
   if gLMSRespawn = LMS_RESPAWN_NONE then Exit;
@@ -4123,25 +4257,10 @@ begin
       gPlayer2 := g_Player_Get(gLMSPID2);
   end;
 
-  for i := Low(gItems) to High(gItems) do
-  begin
-    if gItems[i].Respawnable then
-    begin
-      gItems[i].QuietRespawn := True;
-      gItems[i].RespawnTime := 0;
-    end
-    else
-    begin
-      g_Items_Remove(i);
-      if g_Game_IsNet then MH_SEND_ItemDestroy(True, i);
-    end;
-  end;
+  g_Items_RestartRound();
 
-  for i := Low(gMonsters) to High(gMonsters) do
-  begin
-    if (gMonsters[i] <> nil) and not gMonsters[i].FNoRespawn then
-      gMonsters[i].Respawn;
-  end;
+
+  g_Mons_ForEach(monRespawn);
 
   gLMSSoftSpawn := False;
 end;
@@ -4810,11 +4929,58 @@ begin
   end;
 end;
 
+// profiler console commands
+procedure ProfilerCommands (P: SArray);
+var
+  cmd: string;
+
+  function getBool (idx: Integer): Integer;
+  begin
+    if (idx < 0) or (idx > High(P)) then begin result := -1; exit; end;
+    result := 0;
+    if (P[idx] = '1') or (P[idx] = 'on') or (P[idx] = 'true') or (P[idx] = 'tan') then result := 1;
+  end;
+
+  procedure binaryFlag (var flag: Boolean; msg: string);
+  begin
+    if (Length(p) > 2) then
+    begin
+      g_Console_Add('too many arguments to '''+P[0]+'''');
+    end
+    else
+    begin
+      case getBool(1) of
+        -1: begin end;
+         0: flag := false;
+         1: flag := true;
+      end;
+      if flag then g_Console_Add(msg+': tan') else g_Console_Add(msg+': ona');
+    end;
+  end;
+
+begin
+  //if not gDebugMode then exit;
+  cmd := LowerCase(P[0]);
+
+  if (cmd = 'pf_draw_frame') then begin binaryFlag(g_profile_frame_draw, 'render profiles'); exit; end;
+  if (cmd = 'pf_update_frame') then begin binaryFlag(g_profile_frame_update, 'update profiles (not yet)'); exit; end;
+  if (cmd = 'pf_coldet') then begin binaryFlag(g_profile_collision, 'coldet profiles'); exit; end;
+  if (cmd = 'r_sq_draw') then begin binaryFlag(gdbg_map_use_accel_render, 'accelerated rendering'); exit; end;
+  if (cmd = 'cd_sq_enabled') then begin binaryFlag(gdbg_map_use_accel_coldet, 'accelerated map coldet'); exit; end;
+  if (cmd = 'mon_sq_enabled') then begin binaryFlag(gmon_debug_use_sqaccel, 'accelerated monster coldet'); exit; end;
+  if (cmd = 'wtrace_sq_enabled') then begin binaryFlag(gwep_debug_fast_trace, 'accelerated weapon hitscan'); exit; end;
+  if (cmd = 'pr_enabled') then begin binaryFlag(gpart_dbg_enabled, 'particles'); exit; end;
+  if (cmd = 'pr_phys_enabled') then begin binaryFlag(gpart_dbg_phys_enabled, 'particle physics'); exit; end;
+  if (cmd = 'los_enabled') then begin binaryFlag(gmon_dbg_los_enabled, 'LOS calculations'); exit; end;
+end;
+
+
 procedure DebugCommands(P: SArray);
 var
   a, b: Integer;
   cmd: string;
   //pt: TPoint;
+  mon: TMonster;
 begin
 // Êîìàíäû îòëàäî÷íîãî ðåæèìà:
   if gDebugMode then
@@ -4892,12 +5058,14 @@ begin
           else
             begin
               with gPlayer1.Obj do
-                b := g_Monsters_Create(a,
+              begin
+                mon := g_Monsters_Create(a,
                      X + Rect.X + (Rect.Width div 2),
                      Y + Rect.Y + Rect.Height,
                      gPlayer1.Direction, True);
-              if (Length(P) > 2) and (b >= 0) then
-                gMonsters[b].MonsterBehaviour := Min(Max(StrToIntDef(P[2], BH_NORMAL), BH_NORMAL), BH_GOOD);
+              end;
+              if (Length(P) > 2) and (mon <> nil) then
+                mon.MonsterBehaviour := Min(Max(StrToIntDef(P[2], BH_NORMAL), BH_NORMAL), BH_GOOD);
             end;
         end;
     end
@@ -6632,6 +6800,12 @@ var
 begin
   Parse_Params(pars);
 
+  s := Find_Param_Value(pars, '--profile-render');
+  if (s <> '') then g_profile_frame_draw := true;
+
+  s := Find_Param_Value(pars, '--profile-coldet');
+  if (s <> '') then g_profile_collision := true;
+
 // Debug mode:
   s := Find_Param_Value(pars, '--debug');
   if (s <> '') then
@@ -6657,6 +6831,18 @@ begin
     Exit;
   end;
 
+  s := LowerCase(Find_Param_Value(pars, '-dbg-mainwad'));
+  if (s <> '') then
+  begin
+    gDefaultMegawadStart := s;
+  end;
+
+  if (Find_Param_Value(pars, '--dbg-mainwad-restore') <> '') or
+     (Find_Param_Value(pars, '--dbg-mainwad-default') <> '') then
+  begin
+    gDefaultMegawadStart := DF_Default_Megawad_Start;
+  end;
+
 // Start map when game loads:
   map := LowerCase(Find_Param_Value(pars, '-map'));
   if isWadPath(map) then