BLADERUNNER: Added Generic Walker actors

Fixed isseue of duplicating items in world
Fixed fog issue with incorrect rendering in special occasions
Added basic debugger console
Refactored looping code for better readability

2 files changed, 30 insertions, 26 deletions

diff --git a/engines/bladerunner/ui/esper.cpp b/engines/bladerunner/ui/esper.cpp
index 79b8f5d3ac..181ef0f5d1 100644
--- a/engines/bladerunner/ui/esper.cpp
+++ b/engines/bladerunner/ui/esper.cpp
@@ -26,6 +26,7 @@
 #include "bladerunner/ambient_sounds.h"
 #include "bladerunner/audio_player.h"
 #include "bladerunner/bladerunner.h"
+#include "bladerunner/debugger.h"
 #include "bladerunner/decompress_lcw.h"
 #include "bladerunner/font.h"
 #include "bladerunner/game_info.h"
@@ -577,30 +578,31 @@ void ESPER::draw(Graphics::Surface &surface) {
 			if (_isDrawingSelection) {
 				drawSelection(surface, true, 1);
 			}
-#if BLADERUNNER_DEBUG_RENDERING
-			for (int i = 0; i < kRegionCount; ++i) {
-				if (_regions[i].isPresent) {
-					surface.frameRect(
-						Common::Rect(
-							viewportXToScreenX(_regions[i].rectInner.left),
-							viewportYToScreenY(_regions[i].rectInner.top),
-							viewportXToScreenX(_regions[i].rectInner.right),
-							viewportYToScreenY(_regions[i].rectInner.bottom)
-						),
-						0x7FE0
-					);
-					surface.frameRect(
-						Common::Rect(
-							viewportXToScreenX(_regions[i].rectOuter.left),
-							viewportYToScreenY(_regions[i].rectOuter.top),
-							viewportXToScreenX(_regions[i].rectOuter.right),
-							viewportYToScreenY(_regions[i].rectOuter.bottom)
-						),
-						0x7FE0
-					);
+
+			if (_vm->_debugger->_viewUI) {
+				for (int i = 0; i < kRegionCount; ++i) {
+					if (_regions[i].isPresent) {
+						surface.frameRect(
+							Common::Rect(
+								viewportXToScreenX(_regions[i].rectInner.left),
+								viewportYToScreenY(_regions[i].rectInner.top),
+								viewportXToScreenX(_regions[i].rectInner.right),
+								viewportYToScreenY(_regions[i].rectInner.bottom)
+							),
+							0x7FE0
+						);
+						surface.frameRect(
+							Common::Rect(
+								viewportXToScreenX(_regions[i].rectOuter.left),
+								viewportYToScreenY(_regions[i].rectOuter.top),
+								viewportXToScreenX(_regions[i].rectOuter.right),
+								viewportYToScreenY(_regions[i].rectOuter.bottom)
+							),
+							0x7FE0
+						);
+					}
 				}
 			}
-#endif
 			break;
 		case kEsperPhotoStateScrolling:
 			scrollUpdate();
diff --git a/engines/bladerunner/ui/ui_image_picker.cpp b/engines/bladerunner/ui/ui_image_picker.cpp
index 5cee12fef8..0e00bf0484 100644
--- a/engines/bladerunner/ui/ui_image_picker.cpp
+++ b/engines/bladerunner/ui/ui_image_picker.cpp
@@ -23,6 +23,7 @@
 #include "bladerunner/ui/ui_image_picker.h"
 
 #include "bladerunner/bladerunner.h"
+#include "bladerunner/debugger.h"
 #include "bladerunner/font.h"
 #include "bladerunner/mouse.h"
 #include "bladerunner/shape.h"
@@ -212,10 +213,11 @@ void UIImagePicker::draw(Graphics::Surface &surface) {
 				img.shapeUp->draw(surface, img.rect.left, img.rect.top);
 			}
 		}
-#if BLADERUNNER_DEBUG_RENDERING
-		surface.frameRect(img.rect, 0x7fff);
-		_vm->_mainFont->drawColor(Common::String::format("%d", i), surface, (img.rect.left + img.rect.right) / 2, (img.rect.top + img.rect.bottom) / 2, 0x7fff);
-#endif
+
+		if (_vm->_debugger->_viewUI) {
+			surface.frameRect(img.rect, 0x7fff);
+			_vm->_mainFont->drawColor(Common::String::format("%d", i), surface, (img.rect.left + img.rect.right) / 2, (img.rect.top + img.rect.bottom) / 2, 0x7fff);
+		}
 	}
 }