Working on UI hints
This commit is contained in:
1 parent
3d4560bb51
commit
8552725dfc
28 files changed
+1052
-46
No files matched your search
+10
-4
@@ -215,6 +215,8 @@ namespace ZL
|
||||
"resources/navigation/uni_interior2_unlocked_hall.txt"
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
uniInteriorParams.navigationJsonPaths = {
|
||||
"resources/navigation/uni_interior0_all_locked.json",
|
||||
@@ -262,8 +264,14 @@ namespace ZL
|
||||
locations["uni_interior"]->scriptEngine.setGlobalStore(&globalInts);
|
||||
locations["uni_interior"]->scriptEngine.setGlobalFloatStore(&globalFloats);
|
||||
locations["uni_interior"]->requestDarklandsTransition = [this]() { return startDarklandsTransition(); };
|
||||
locations["uni_interior"]->requestAdvanceDarklandsHud = [this]() { menuManager.advanceUniIntDarklandsHud(); };
|
||||
if (locations["uni_interior"]->player)
|
||||
locations["uni_interior"]->player->onDeathAnimComplete = [this]() { startDarklandsTransition(); };
|
||||
for (auto& npc : locations["uni_interior"]->npcs) {
|
||||
if (npc && npc->canAttack) {
|
||||
npc->onDeathAnimComplete = [this]() { menuManager.onEnemyKilledInUniInterior(); };
|
||||
}
|
||||
}
|
||||
|
||||
LocationSetup uniExteriorParams = uniInteriorParams;
|
||||
uniExteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects_uni_exterior.json";
|
||||
@@ -309,7 +317,7 @@ namespace ZL
|
||||
"resources/navigation/dorm2_b.json",
|
||||
"resources/navigation/dorm2_all_open.json",
|
||||
};*/
|
||||
|
||||
|
||||
|
||||
/*
|
||||
params_dorm.navigationJsonPaths = {
|
||||
@@ -381,6 +389,7 @@ namespace ZL
|
||||
if (menuManager.tutorialStep == TutorialStep::Step2) {
|
||||
menuManager.advanceTutorialStep();
|
||||
}
|
||||
menuManager.onPlayerStartedWalking();
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1056,7 +1065,6 @@ namespace ZL
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// Only the primary, non-UI-captured pointer can promote itself into a
|
||||
// camera-rotation drag once it crosses the movement threshold.
|
||||
if (hasPrimaryPointer && fingerId == primaryPointerId && it != activePointers.end()
|
||||
@@ -1068,7 +1076,6 @@ namespace ZL
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (currentLocation) {
|
||||
// Forwarded for dialogue hover and (when cameraDragging) camera rotation.
|
||||
currentLocation->handleMotion(fingerId, eventX, eventY, mx, my);
|
||||
@@ -1108,7 +1115,6 @@ namespace ZL
|
||||
if (darklandsFlashAlpha >= 1.0f) {
|
||||
isDarklands = !isDarklands;
|
||||
|
||||
|
||||
// Change HUD
|
||||
menuManager.setDarklandsMode(isDarklands);
|
||||
|
||||
|
||||
Reference in new issue
Block a user