Merge remote-tracking branch 'origin/pvs-fix' into pvs-fix

This commit is contained in:
Vyacheslav Ivanov 2024-08-03 23:15:15 +03:00 committed by Pugemon
commit 815ba45747
No known key found for this signature in database
GPG Key ID: 472FA343B3CC3287
2 changed files with 2 additions and 3 deletions

View File

@ -257,13 +257,13 @@ void PlayerController::postUpdate(float delta, bool input, bool pause) {
if (!pause && input) { if (!pause && input) {
camControl.updateMouse(this->input); camControl.updateMouse(this->input);
} }
player->postUpdate();
camControl.update(this->input, delta, level->chunks.get());
if (input) { if (input) {
updateInteraction(); updateInteraction();
} else { } else {
player->selection = {}; player->selection = {};
} }
player->postUpdate();
camControl.update(this->input, delta, level->chunks.get());
} }
void PlayerController::updateKeyboard() { void PlayerController::updateKeyboard() {

View File

@ -143,7 +143,6 @@ void Player::updateSelectedEntity() {
selectedEid = selection.entity; selectedEid = selection.entity;
} }
#include "../window/Window.hpp"
void Player::postUpdate() { void Player::postUpdate() {
auto entity = level->entities->get(eid); auto entity = level->entities->get(eid);
if (!entity.has_value()) { if (!entity.has_value()) {