Code works more or less good
This commit is contained in:
1 parent
3495d28edf
commit
348aa632dd
17 files changed
+4180
-56
No files matched your search
+3
-4
@@ -160,7 +160,7 @@ namespace ZL
|
||||
std::cout << "Load resurces step 4" << std::endl;
|
||||
|
||||
LocationSetup params1;
|
||||
params1.roomMeshPath = "resources/w/room001.txt";
|
||||
params1.roomMeshPath = "resources/w/room003.txt";
|
||||
params1.roomTexturePath = "resources/w/room005.png";
|
||||
params1.gameObjectsJsonPath = "resources/config2/gameobjects.json";
|
||||
params1.npcsJsonPath = "resources/config2/npcs.json";
|
||||
@@ -168,7 +168,6 @@ namespace ZL
|
||||
params1.navigationJsonPath = "resources/config2/navigation.json";
|
||||
params1.scriptPath = "resources/start.lua";
|
||||
params1.playerPosition = Eigen::Vector3f::Zero();
|
||||
params1.ghostPosition = Eigen::Vector3f(0.f, 0.f, -20.f);
|
||||
params1.teleportPosition = Eigen::Vector3f(-2.03001f, 0.f, -4.95618f);
|
||||
params1.teleportRadius = 1.5f;
|
||||
|
||||
@@ -185,7 +184,6 @@ namespace ZL
|
||||
params2.playerPosition = Eigen::Vector3f(7.f, 0.f, 27.f);
|
||||
|
||||
params2.npcsJsonPath = "resources/config2/npcs2.json";
|
||||
params2.ghostPosition = Eigen::Vector3f(700.f, 0.f, 700.f);
|
||||
params2.teleportPosition = Eigen::Vector3f(-6.45, 0.0, 7.82);
|
||||
params2.teleportRadius = 1.5f;
|
||||
location2 = std::make_shared<Location>(renderer, inventory);
|
||||
@@ -270,6 +268,7 @@ namespace ZL
|
||||
this->menuManager.uiManager.setText("inventory_items_text", itemText);
|
||||
});
|
||||
|
||||
|
||||
menuManager.uiManager.setTextButtonCallback("close_inventory_button", [this](const std::string& name) {
|
||||
std::cout << "[UI] Close button clicked" << std::endl;
|
||||
menuManager.uiManager.setNodeVisible("inventory_items_panel", false);
|
||||
@@ -531,7 +530,7 @@ namespace ZL
|
||||
|
||||
case SDLK_o:
|
||||
//y = y + 0.002;
|
||||
currentLocation->player->hp = 5;
|
||||
currentLocation->player->hp = 200;
|
||||
break;
|
||||
|
||||
case SDLK_k:
|
||||
|
||||
Reference in new issue
Block a user