From dee96154835787ba4c3e2b1e5ad0a360e20b95a8 Mon Sep 17 00:00:00 2001
From: Vladislav Khorev <mephi1984@gmail.com>
Date: Fri, 12 Jun 2026 14:40:41 +0300
Subject: [PATCH] Working on UI fixing

---
 proj-web/index.html              |  2 +-
 src/Game.cpp                     |  5 +++--
 src/MenuManager.cpp              |  2 --
 src/dialogue/DialogueOverlay.cpp | 32 ++++++++++++++++++--------------
 src/main.cpp                     |  4 ++--
 5 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/proj-web/index.html b/proj-web/index.html
index 2f35ddb..131d198 100644
--- a/proj-web/index.html
+++ b/proj-web/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
-    <title>Bishkek Witcher</title>
+    <title>Shadow Over Bishkek</title>
     <style>
         body, html {
             margin: 0; padding: 0; width: 100%; height: 100%;
diff --git a/src/Game.cpp b/src/Game.cpp
index 0c437c7..9eeef8c 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -223,7 +223,8 @@ namespace ZL
 			"resources/navigation/uni_interior4_locked.txt" //16
 		};
 
-	
+
+
 		/*
 		uniInteriorParams.navigationJsonPaths = {
 			"resources/navigation/uni_interior4_unlocked_n2.json", //0
@@ -872,7 +873,7 @@ namespace ZL
 
 					break;
 				case SDLK_e:
-					currentLocation->dialogueSystem.startCutscene("lection_cutscene001"); //.startDialogue("test_cutscene_pan_dialogue");
+					//currentLocation->dialogueSystem.startCutscene("lection_cutscene001"); //.startDialogue("test_cutscene_pan_dialogue");
 					break;
 
 
diff --git a/src/MenuManager.cpp b/src/MenuManager.cpp
index f2e6d4d..6106801 100644
--- a/src/MenuManager.cpp
+++ b/src/MenuManager.cpp
@@ -89,8 +89,6 @@ namespace ZL {
 		hudRoot       = loadUiFromFile("resources/w/ui/hud_step0.json",   renderer, zipFile);
 		hudStep1Root  = loadUiFromFile("resources/w/ui/hud_step1.json",  renderer, zipFile);
 		hudStep2Root  = loadUiFromFile("resources/w/ui/hud_step2.json",  renderer, zipFile);
-		hudStep1Root  = loadUiFromFile("resources/w/ui/hud_uni_int_step11.json",  renderer, zipFile);
-		hudStep2Root  = loadUiFromFile("resources/w/ui/hud_uni_int_step11.json",  renderer, zipFile);
 		hudStep3Root  = loadUiFromFile("resources/w/ui/hud_step3.json",  renderer, zipFile);
 		hudStep4Root  = loadUiFromFile("resources/w/ui/hud_step4.json",  renderer, zipFile);
 		hudStep5aRoot = loadUiFromFile("resources/w/ui/hud_step5a.json", renderer, zipFile);
diff --git a/src/dialogue/DialogueOverlay.cpp b/src/dialogue/DialogueOverlay.cpp
index 12caea4..88dca81 100644
--- a/src/dialogue/DialogueOverlay.cpp
+++ b/src/dialogue/DialogueOverlay.cpp
@@ -56,12 +56,21 @@ void DialogueOverlay::draw(Renderer& renderer, const PresentationModel& model) {
 		return;
 	}
 
-	//const float W = Environment::projectionWidth;
-	const float W = 1280.0;
+	const float W = Environment::projectionWidth;
 
-	UiRect portraitRect{ 24.0f + 90, 24.0f + 16, 176.0f, 176.0f };
-	UiRect textboxRect{ 30.f, -48.f, 1222.f, 340.0f };
-	UiRect textboxChoiceRect{ 30.f, -90.f, 1200.f, 619.5f };
+	const float nameX = 312 + 8;
+	const float nameY = 232 - 38.0f;
+	const float bodyX = 312 + 8;
+	const float bodyY = 232 - 78.0f;
+
+	const float bodyMaxWidthPx = 1280.0 - nameX - 48.f - 60.f;
+	
+
+	float centeredShiftX = ((W - nameX - 48.f - 60.f) - bodyMaxWidthPx)*0.5;
+
+	UiRect portraitRect{ 24.0f + 90 + centeredShiftX, 24.0f + 16, 176.0f, 176.0f };
+	UiRect textboxRect{ 30.f + centeredShiftX, -48.f, 1222.f, 340.0f };
+	UiRect textboxChoiceRect{ 30.f + centeredShiftX, -90.f, 1200.f, 619.5f };
 
 	lastDialogueAdvanceRect = { portraitRect.x, portraitRect.y, textboxRect.x + textboxRect.w - portraitRect.x, textboxRect.h };
 
@@ -119,10 +128,6 @@ void DialogueOverlay::draw(Renderer& renderer, const PresentationModel& model) {
 	renderer.shaderManager.PopShader();
 
 
-	const float nameX = 312+8;
-	const float nameY = 232 - 38.0f;
-	const float bodyX = 312+8;
-	const float bodyY = 232 - 78.0f;
 
 	lastChoiceRects.clear();
 
@@ -130,18 +135,17 @@ void DialogueOverlay::draw(Renderer& renderer, const PresentationModel& model) {
 
 		if (model.mode == PresentationMode::Choice)
 		{
-			nameRenderer->drawText(model.speaker, nameX+20, nameY+230, 1.0f, false, { 1.0f, 0.88f, 0.45f, 1.0f });
+			nameRenderer->drawText(model.speaker, nameX+20 + centeredShiftX, nameY+230, 1.0f, false, { 1.0f, 0.88f, 0.45f, 1.0f });
 		}
 		else
 		{
 
-			nameRenderer->drawText(model.speaker, nameX, nameY, 1.0f, false, { 1.0f, 0.88f, 0.45f, 1.0f });
+			nameRenderer->drawText(model.speaker, nameX + centeredShiftX, nameY, 1.0f, false, { 1.0f, 0.88f, 0.45f, 1.0f });
 		}
 	}
 
-	const float bodyMaxWidthPx = W - nameX - 48.f - 60.f;
 	const std::string wrappedBody = wrapTextToWidth(model.visibleText, *bodyRenderer, bodyMaxWidthPx, 1.0f);
-	bodyRenderer->drawText(wrappedBody, bodyX, bodyY, 1.0f, false, { 1.0f, 1.0f, 1.0f, 1.0f });
+	bodyRenderer->drawText(wrappedBody, bodyX + centeredShiftX, bodyY, 1.0f, false, { 1.0f, 1.0f, 1.0f, 1.0f });
 
 	
 	if (model.mode == PresentationMode::Choice) {
@@ -166,7 +170,7 @@ void DialogueOverlay::draw(Renderer& renderer, const PresentationModel& model) {
 
 		for (size_t i = 0; i < model.choices.size(); ++i) {
 			const float cy = choiceStartY + (choiceHeight + choiceSpacing) * static_cast<float>(model.choices.size() - 1 - i);
-			UiRect rect{ 320.f, cy, choiceWidth, choiceHeight };
+			UiRect rect{ 320.f + centeredShiftX , cy, choiceWidth, choiceHeight };
 			lastChoiceRects.push_back(rect);
 			choiceQuads[i].rebuild(rect);
 
diff --git a/src/main.cpp b/src/main.cpp
index 2cafc56..d147002 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -175,7 +175,7 @@ extern "C" int SDL_main(int argc, char* argv[]) {
 
 
     ZL::Environment::window = SDL_CreateWindow(
-        "Bishkek Witcher Game",
+        "Shadow Over Bishkek",
         SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
         ZL::Environment::width, ZL::Environment::height,
         SDL_WINDOW_FULLSCREEN | SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN
@@ -263,7 +263,7 @@ int main(int argc, char *argv[]) {
 #endif
 
         ZL::Environment::window = SDL_CreateWindow(
-            "Bishkek Witcher Game",
+            "Shadow Over Bishkek",
             SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
             ZL::Environment::width, ZL::Environment::height,
             windowFlags
