From: Ketmar Dark <ketmar@ketmar.no-ip.org>
Date: Fri, 18 Aug 2017 19:18:28 +0000 (+0300)
Subject: cosmetic variable renamings
X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=5f3074c27e9576753fe1099858cd0a4e022e6f54;p=d2df-sdl.git

cosmetic variable renamings
---

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index e69bde9..1b649f8 100644
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -5040,10 +5040,10 @@ begin
   begin
     case getBool(1) of
       -1: begin end;
-       0: gdbg_map_use_grid_render := false;
-       1: gdbg_map_use_grid_render := true;
+       0: gdbg_map_use_accel_render := false;
+       1: gdbg_map_use_accel_render := true;
     end;
-    if gdbg_map_use_grid_render then g_Console_Add('accelerated rendering: tan') else g_Console_Add('accelerated rendering: ona');
+    if gdbg_map_use_accel_render then g_Console_Add('accelerated rendering: tan') else g_Console_Add('accelerated rendering: ona');
     exit;
   end;
 
@@ -5051,10 +5051,10 @@ begin
   begin
     case getBool(1) of
       -1: begin end;
-       0: gdbg_map_use_grid_coldet := false;
-       1: gdbg_map_use_grid_coldet := true;
+       0: gdbg_map_use_accel_coldet := false;
+       1: gdbg_map_use_accel_coldet := true;
     end;
-    if gdbg_map_use_grid_coldet then g_Console_Add('accelerated coldet: tan') else g_Console_Add('accelerated coldet: ona');
+    if gdbg_map_use_accel_coldet then g_Console_Add('accelerated coldet: tan') else g_Console_Add('accelerated coldet: ona');
     exit;
   end;
 
diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 0e5dd09..b5e457c 100644
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -134,8 +134,8 @@ var
   BackID:  DWORD = DWORD(-1);
   gExternalResources: TStringList;
 
-  gdbg_map_use_grid_render: Boolean = true;
-  gdbg_map_use_grid_coldet: Boolean = true;
+  gdbg_map_use_accel_render: Boolean = true;
+  gdbg_map_use_accel_coldet: Boolean = true;
   gdbg_map_use_tree_draw: Boolean = false;
   gdbg_map_use_tree_coldet: Boolean = false;
   gdbg_map_dump_coldet_tree_queries: Boolean = false;
@@ -1949,7 +1949,7 @@ begin
   dplClear();
   ptag := panelTypeToTag(PanelType);
 
-  if gdbg_map_use_grid_render then
+  if gdbg_map_use_accel_render then
   begin
     if gdbg_map_use_tree_draw then
     begin
@@ -2264,7 +2264,7 @@ begin
   //TODO: detailed profile
   if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('wall coldet');
   try
-    if gdbg_map_use_grid_coldet then
+    if gdbg_map_use_accel_coldet then
     begin
       if gdbg_map_use_tree_coldet then
       begin
@@ -2337,29 +2337,16 @@ var
     end;
   end;
 
-{var
-  cctype1: Integer = 3; // priority: 0: water, 1: acid1, 2: acid2; 3: others (nothing)
-  texid1: DWORD;}
 begin
   //TODO: detailed profile?
   if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquid coldet');
   try
-    if gdbg_map_use_grid_coldet then
+    if gdbg_map_use_accel_coldet then
     begin
       texid := TEXTURE_NONE;
       if gdbg_map_use_tree_coldet then
       begin
         mapTree.aabbQuery(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
-        {
-        cctype1 := cctype;
-        texid1 := texid;
-        cctype := 3;
-        texid := TEXTURE_NONE;
-        gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
-        if (cctype1 <> cctype) or (texid1 <> texid) then
-        begin
-          e_WriteLog(Format('g_Map_CollideLiquid_Texture(%d, %d, %u, %u): tree(cctype:%d;texid:%u); grid(cctype:%d;texid:%u)', [X, Y, Width, Height, cctype1, texid1, cctype, texid]), MSG_WARNING);
-        end;}
       end
       else
       begin