salmon-engine-projects/space-game001
14
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final version

Browse Source
This commit is contained in:
Vladislav Khorev 2026-04-20 01:11:24 +03:00
parent d64659c8d6
commit 074c586edf
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Game.cpp
View File

@ -127,7 +127,7 @@ namespace ZL
#ifdef EMSCRIPTEN #ifdef EMSCRIPTEN
renderer.shaderManager.AddShaderFromFiles("env_sky", "resources/shaders/env_sky.vertex", "resources/shaders/env_sky_web.fragment", CONST_ZIP_FILE); 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("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("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); 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; break;
case SDLK_p: case SDLK_p:
x = x + 1; //x = x + 1;
break; break;
case SDLK_o: case SDLK_o:
menuManager.setupWinMenu(); //menuManager.setupWinMenu();
break; break;
case SDLK_l: case SDLK_l:
menuManager.setupLooseMenu(); //menuManager.setupLooseMenu();
break; break;
case SDLK_w: case SDLK_w:

16
src/Location.cpp
View File

@ -1902,7 +1902,9 @@ void Location::setup()
approachTarget.y() = 0.f; approachTarget.y() = 0.f;
bandit->setTarget(approachTarget); bandit->setTarget(approachTarget);
if (dialogueSystem.startDialogue("dialogue_bandit1")) { if (dialogueSystem.startDialogue("dialogue_bandit1", [this]() {
if (onGameLost) onGameLost();
})) {
dialoguePlayedBandit1 = true; dialoguePlayedBandit1 = true;
banditExitedNpcBanditCar = true; banditExitedNpcBanditCar = true;
playerFrozen = true; playerFrozen = true;
@ -1943,7 +1945,9 @@ void Location::setup()
npcBanditCar.velocity = 0.f; npcBanditCar.velocity = 0.f;
npcCar.mode = NpcCar::Mode::NONE_STAY; npcCar.mode = NpcCar::Mode::NONE_STAY;
npcCar.velocity = 0.f; npcCar.velocity = 0.f;
if (dialogueSystem.startDialogue("driving_dialogue_final")) { if (dialogueSystem.startDialogue("driving_dialogue_final", [this]() {
if (onGameWon) onGameWon();
})) {
dialoguePlayedDrivingFinal = true; dialoguePlayedDrivingFinal = true;
} }
} }
@ -2034,6 +2038,7 @@ void Location::setup()
dialoguePlayedBanditCaught3 = true; dialoguePlayedBanditCaught3 = true;
if (!inCar) { if (!inCar) {
playerFrozen = true; playerFrozen = true;
if (onGameLost) onGameLost();
} }
} }
} }
@ -2041,6 +2046,7 @@ void Location::setup()
if (dialoguePlayedBanditCaught3 && !inCar) { if (dialoguePlayedBanditCaught3 && !inCar) {
playerFrozen = true; playerFrozen = true;
if (onGameLost) onGameLost();
} }
if (girlfriendInCar && !dialoguePlayedVillageFinal1 && !dialogueSystem.isActive()) { if (girlfriendInCar && !dialoguePlayedVillageFinal1 && !dialogueSystem.isActive()) {
@ -2466,16 +2472,16 @@ void Location::setup()
case SDLK_d: keyRight = true; break; case SDLK_d: keyRight = true; break;
case SDLK_i: invertCameraY = !invertCameraY; break; case SDLK_i: invertCameraY = !invertCameraY; break;
case SDLK_u: case SDLK_u:
std::cout << player->position << std::endl; //std::cout << player->position << std::endl;
//girlfriend->setTarget(player->position); //girlfriend->setTarget(player->position);
break; break;
case SDLK_m: 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_PLAYER
: NpcCar::Mode::FOLLOW_WAYPOINTS; : NpcCar::Mode::FOLLOW_WAYPOINTS;
std::cout << "[NPC_CAR] Mode: " std::cout << "[NPC_CAR] Mode: "
<< (npcCar.mode == NpcCar::Mode::FOLLOW_WAYPOINTS ? "FOLLOW_WAYPOINTS" : "FOLLOW_PLAYER") << (npcCar.mode == NpcCar::Mode::FOLLOW_WAYPOINTS ? "FOLLOW_WAYPOINTS" : "FOLLOW_PLAYER")
<< std::endl; << std::endl;*/
break; break;
default: break; default: break;
} }