From 074c586edf379e1147295746a8e30aa45121f7f2 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Mon, 20 Apr 2026 01:11:24 +0300 Subject: [PATCH] Final version --- src/Game.cpp | 8 ++++---- src/Location.cpp | 16 +++++++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/Game.cpp b/src/Game.cpp index 3501dee..8789c24 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -127,7 +127,7 @@ namespace ZL #ifdef EMSCRIPTEN renderer.shaderManager.AddShaderFromFiles("env_sky", "resources/shaders/env_sky.vertex", "resources/shaders/env_sky_web.fragment", CONST_ZIP_FILE); - renderer.shcuaderManager.AddShaderFromFiles("defaultAtmosphere", "resources/shaders/defaultAtmosphere.vertex", "resources/shaders/defaultAtmosphere_web.fragment", CONST_ZIP_FILE); + renderer.shaderManager.AddShaderFromFiles("defaultAtmosphere", "resources/shaders/defaultAtmosphere.vertex", "resources/shaders/defaultAtmosphere_web.fragment", CONST_ZIP_FILE); renderer.shaderManager.AddShaderFromFiles("planetBake", "resources/shaders/planet_bake.vertex", "resources/shaders/planet_bake_web.fragment", CONST_ZIP_FILE); renderer.shaderManager.AddShaderFromFiles("planetStone", "resources/shaders/planet_stone.vertex", "resources/shaders/planet_stone_web.fragment", CONST_ZIP_FILE); renderer.shaderManager.AddShaderFromFiles("planetLand", "resources/shaders/planet_land.vertex", "resources/shaders/planet_land_web.fragment", CONST_ZIP_FILE); @@ -604,14 +604,14 @@ namespace ZL break; case SDLK_p: - x = x + 1; + //x = x + 1; break; case SDLK_o: - menuManager.setupWinMenu(); + //menuManager.setupWinMenu(); break; case SDLK_l: - menuManager.setupLooseMenu(); + //menuManager.setupLooseMenu(); break; case SDLK_w: diff --git a/src/Location.cpp b/src/Location.cpp index acf7d20..852b12d 100644 --- a/src/Location.cpp +++ b/src/Location.cpp @@ -1902,7 +1902,9 @@ void Location::setup() approachTarget.y() = 0.f; bandit->setTarget(approachTarget); - if (dialogueSystem.startDialogue("dialogue_bandit1")) { + if (dialogueSystem.startDialogue("dialogue_bandit1", [this]() { + if (onGameLost) onGameLost(); + })) { dialoguePlayedBandit1 = true; banditExitedNpcBanditCar = true; playerFrozen = true; @@ -1943,7 +1945,9 @@ void Location::setup() npcBanditCar.velocity = 0.f; npcCar.mode = NpcCar::Mode::NONE_STAY; npcCar.velocity = 0.f; - if (dialogueSystem.startDialogue("driving_dialogue_final")) { + if (dialogueSystem.startDialogue("driving_dialogue_final", [this]() { + if (onGameWon) onGameWon(); + })) { dialoguePlayedDrivingFinal = true; } } @@ -2034,6 +2038,7 @@ void Location::setup() dialoguePlayedBanditCaught3 = true; if (!inCar) { playerFrozen = true; + if (onGameLost) onGameLost(); } } } @@ -2041,6 +2046,7 @@ void Location::setup() if (dialoguePlayedBanditCaught3 && !inCar) { playerFrozen = true; + if (onGameLost) onGameLost(); } if (girlfriendInCar && !dialoguePlayedVillageFinal1 && !dialogueSystem.isActive()) { @@ -2466,16 +2472,16 @@ void Location::setup() case SDLK_d: keyRight = true; break; case SDLK_i: invertCameraY = !invertCameraY; break; case SDLK_u: - std::cout << player->position << std::endl; + //std::cout << player->position << std::endl; //girlfriend->setTarget(player->position); break; case SDLK_m: - npcCar.mode = (npcCar.mode == NpcCar::Mode::FOLLOW_WAYPOINTS) + /*npcCar.mode = (npcCar.mode == NpcCar::Mode::FOLLOW_WAYPOINTS) ? NpcCar::Mode::FOLLOW_PLAYER : NpcCar::Mode::FOLLOW_WAYPOINTS; std::cout << "[NPC_CAR] Mode: " << (npcCar.mode == NpcCar::Mode::FOLLOW_WAYPOINTS ? "FOLLOW_WAYPOINTS" : "FOLLOW_PLAYER") - << std::endl; + << std::endl;*/ break; default: break; }