X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=38fb35a5f5b8792903142ade3cfcfcd5e6df3fe3;hb=de88b5482374846d66aefa81d45394213057082b;hp=9edbcf0ed2f5c7d00cbba3850735174494a7419c;hpb=77620b19e88e8eb4884be54475632754d8a4014e;p=d2df-sdl.git

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 9edbcf0..38fb35a 100644
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -3298,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;
@@ -3311,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;
 
@@ -4927,87 +4941,40 @@ var
     if (P[idx] = '1') or (P[idx] = 'on') or (P[idx] = 'true') or (P[idx] = 'tan') then result := 1;
   end;
 
-begin
-  //if not gDebugMode then exit;
-  cmd := LowerCase(P[0]);
-
-  if cmd = 'pf_draw_frame' then
-  begin
-    g_profile_frame_draw := not g_profile_frame_draw;
-    exit;
-  end;
-
-  if cmd = 'pf_update_frame' then
-  begin
-    g_profile_frame_update := not g_profile_frame_update;
-    exit;
-  end;
-
-  if cmd = 'pf_coldet' then
-  begin
-    g_profile_collision := not g_profile_collision;
-    exit;
-  end;
-
-  if cmd = 'r_sq_draw' then
+  procedure binaryFlag (var flag: Boolean; msg: string);
   begin
-    case getBool(1) of
-      -1: begin end;
-       0: gdbg_map_use_accel_render := false;
-       1: gdbg_map_use_accel_render := true;
-    end;
-    if gdbg_map_use_accel_render then g_Console_Add('accelerated rendering: tan') else g_Console_Add('accelerated rendering: ona');
-    exit;
-  end;
-
-  if cmd = 'dbg_sq_coldet' then
-  begin
-    case getBool(1) of
-      -1: begin end;
-       0: gdbg_map_use_accel_coldet := false;
-       1: gdbg_map_use_accel_coldet := true;
+    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;
-    if gdbg_map_use_accel_coldet then g_Console_Add('accelerated coldet: tan') else g_Console_Add('accelerated coldet: ona');
-    exit;
   end;
 
-  if (cmd = 'sq_use_grid') or (cmd = 'sq_use_tree') then
-  begin
-    gdbg_map_use_tree_coldet := (cmd = 'sq_use_tree');
-    if gdbg_map_use_tree_coldet then g_Console_Add('coldet acceleration: tree') else g_Console_Add('coldet acceleration: grid');
-    exit;
-  end;
-
-  if (cmd = 'r_sq_use_grid') or (cmd = 'r_sq_use_tree') then
-  begin
-    gdbg_map_use_tree_draw := (cmd = 'r_sq_use_tree');
-    if gdbg_map_use_tree_draw then g_Console_Add('render acceleration: tree') else g_Console_Add('render acceleration: grid');
-    exit;
-  end;
-
-  if (cmd = 't_dump_node_queries') then
-  begin
-    case getBool(1) of
-      -1: begin end;
-       0: gdbg_map_dump_coldet_tree_queries := false;
-       1: gdbg_map_dump_coldet_tree_queries := true;
-    end;
-    if gdbg_map_dump_coldet_tree_queries then g_Console_Add('grid coldet tree queries: tan') else g_Console_Add('grid coldet tree queries: ona');
-    exit;
-  end;
+begin
+  //if not gDebugMode then exit;
+  cmd := LowerCase(P[0]);
 
-  if (cmd = 'mon_sq_enabled') then
-  begin
-    case getBool(1) of
-      -1: begin end;
-       0: gmon_debug_use_sqaccel := false;
-       1: gmon_debug_use_sqaccel := true;
-    end;
-    if gmon_debug_use_sqaccel then g_Console_Add('accelerated monster coldet: tan') else g_Console_Add('accelerated monster coldet: ona');
-    exit;
-  end;
+  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;