Prepare for release002, not tested yet though
This commit is contained in:
1 parent
3d3522b905
commit
a743f653dd
4 files changed
+33
-42
No files matched your search
+3
-20
@@ -1295,7 +1295,7 @@ namespace ZL
|
||||
if (Environment::zoom > zoomMax) {
|
||||
Environment::zoom = zoomMax;
|
||||
}
|
||||
logger() << "Current zoom: " << Environment::zoom << std::endl;
|
||||
..logger() << "Current zoom: " << Environment::zoom << std::endl;
|
||||
// Tutorial step3 → step4: any mouse-wheel scroll counts as "zoom gesture".
|
||||
if (gameState.tutorialStep == TutorialStep::Step3) {
|
||||
menuManager.advanceTutorialStep();
|
||||
@@ -1304,7 +1304,7 @@ namespace ZL
|
||||
|
||||
if (event.type == SDL_KEYDOWN && event.key.repeat == 0) {
|
||||
switch (event.key.keysym.sym) {
|
||||
case SDLK_8:
|
||||
/*case SDLK_8:
|
||||
if (editorMode == EditorMode::InteractiveObjects && currentLocation()) {
|
||||
currentLocation()->editor.selectInteractiveObject(8);
|
||||
} else {
|
||||
@@ -1424,12 +1424,6 @@ namespace ZL
|
||||
break;
|
||||
|
||||
case SDLK_j:
|
||||
/*
|
||||
if (editorMode != EditorMode::None && currentLocation()) {
|
||||
currentLocation()->editor.placeTree();
|
||||
} else {
|
||||
menuManager.toggleQuestJournal();
|
||||
}*/
|
||||
currentLocation()->editor.placeTree();
|
||||
break;
|
||||
|
||||
@@ -1439,8 +1433,7 @@ namespace ZL
|
||||
}
|
||||
break;
|
||||
|
||||
case SDLK_RETURN:
|
||||
|
||||
case SDLK_RETURN:*/
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -1459,16 +1452,6 @@ namespace ZL
|
||||
//menuManager.uiManager.onKeyPress((unsigned char)event.text.text[0]);
|
||||
}
|
||||
}
|
||||
|
||||
if (event.type == SDL_KEYUP) {
|
||||
if (event.key.keysym.sym == SDLK_r) {
|
||||
logger() << "Camera position: x=" << x << " y=" << y << " z=" << z << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
if (event.type == SDL_KEYUP) {
|
||||
|
||||
}
|
||||
}
|
||||
// Drain one loading step per frame so the window/tab keeps pumping events
|
||||
// and repainting between steps instead of freezing for the whole load.
|
||||
|
||||
Reference in new issue
Block a user