Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/mlthelama/LamasTinyHUD into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
mlthelama committed Jan 26, 2024
2 parents 5c80d01 + 6cda1f3 commit 0574d5b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/equip/magic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ namespace equip {
/*for (const auto& form : RE::TESDataHandler::GetSingleton()->GetFormArray<RE::TESIdleForm>()){
logger::debug("formid {}, form name {}"sv, util::string_util::int_to_hex(form->formID), form->GetName());
}*/
if(const auto* current = a_player->GetActorRuntimeData().currentProcess; current) {
if (const auto* current = a_player->GetActorRuntimeData().currentProcess; current) {
//if (current)
//auto* idle = RE::TESForm::LookupByEditorID<RE::TESIdleForm>("RightCastSelf");
}

auto is_self_target = spell->GetDelivery() == RE::MagicSystem::Delivery::kSelf;
auto* target = is_self_target ? actor : actor->GetActorRuntimeData().currentCombatTarget.get().get();

Expand Down
2 changes: 1 addition & 1 deletion src/event/key_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ namespace event {
}

const auto* control_map = RE::ControlMap::GetSingleton();
if (!control_map || !control_map->IsMovementControlsEnabled() ) {/*||
if (!control_map || !control_map->IsMovementControlsEnabled()) { /*||
control_map->contextPriorityStack.back() != RE::UserEvents::INPUT_CONTEXT_ID::kGameplay) {*/
continue;
}
Expand Down
14 changes: 7 additions & 7 deletions src/ui/ui_renderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ namespace ui {
}

const auto rendererData = renderer->GetRendererDataSingleton();
const auto context = rendererData->context;

const auto context = rendererData->context;
const auto swapChain = rendererData->renderWindows->swapChain;
const auto forwarder = rendererData->forwarder;

logger::info("Getting swapchain..."sv);
auto* swapchain = swapChain;
if (!swapchain) {
Expand Down Expand Up @@ -142,7 +142,7 @@ namespace ui {
}

const auto rendererData = renderer->GetRendererDataSingleton();
const auto forwarder = rendererData->forwarder;
const auto forwarder = rendererData->forwarder;

unsigned char* image_data{};
int image_width = 0;
Expand Down Expand Up @@ -707,12 +707,12 @@ namespace ui {
if (fade == 0.0f) {
return;
}

if (!show_ui_) {
return;
}
if ( !should_show_ui()){

if (!should_show_ui()) {
return;
}
/*if (!show_ui_ || fade == 0.0f || !should_show_ui()) {
Expand Down
2 changes: 1 addition & 1 deletion src/util/player/perk_visitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace util {
actor_ = a_actor;
result_ = a_base;
}

RE::BSContainer::ForEachResult Visit(RE::BGSPerkEntry* perk_entry) override;

[[nodiscard]] float get_result() const;
Expand Down

0 comments on commit 0574d5b

Please sign in to comment.