Skip to content

Commit

Permalink
fix (#40)
Browse files Browse the repository at this point in the history
* fixes
- removed duplicate entry of molag bal
- do not take input if cursor is in skyui search
- do not take input inside item menus if menus are unpaused (Skyrim
Souls)
  • Loading branch information
mlthelama authored Feb 17, 2024
2 parents d78b735 + e00c6da commit 3222582
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.25)

set(NAME "SkyrimCharacterSheet")
set(VERSION 1.1.2.0)
set(VERSION 1.1.3.0)

# ---- Options ----

Expand Down
13 changes: 0 additions & 13 deletions config/SkyrimCharacterSheet_Champion.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,19 +112,6 @@
550
]
},
{
"key": "molag_bal",
"name": "$ShowMolagBal",
"mod": "Skyrim.esm",
"quest_form": "0x00022F08",
"quest_stage_favor": [
200
],
"quest_stage_alternate": [
500,
550
]
},
{
"key": "namira",
"name": "$ShowNamira",
Expand Down
5 changes: 5 additions & 0 deletions src/event/input_event.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ namespace event {
continue;
}

if (ui->IsItemMenuOpen()) {
continue;
}


//for whatever reason I can open the menu while at a crafting station
//so let that not happen
if (ui->IsMenuOpen(RE::CraftingMenu::MENU_NAME) ||
Expand Down
7 changes: 7 additions & 0 deletions src/hook/menu_control_hook.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ namespace hook {

if (a_event && *a_event && is_menu_open(ui)) {
auto* inventory_manager = RE::Inventory3DManager::GetSingleton();
auto* control_map = RE::ControlMap::GetSingleton();

for (auto* event = *a_event; event; event = event->next) {
if (inventory_manager && inventory_manager->GetRuntimeData().zoomProgress != 0.f) {
Expand Down Expand Up @@ -115,6 +116,12 @@ namespace hook {
continue;
}

if (control_map->GetRuntimeData().textEntryCount > 0) {
logger::trace("continue. due text input, count {}"sv,
control_map->GetRuntimeData().textEntryCount);
continue;
}

if (key_input->get_inventory_open_key_combo().contains(key) ||
key_input->get_inventory_close_key_combo().contains(key)) {
key_input->add_key_down(key);
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "skyrimcharactersheet",
"version-string": "1.1.2.0",
"version-string": "1.1.3.0",
"description": "An info page",
"homepage": "https://github.com/mlthelama/SkyrimCharacterSheet",
"license": "GPL-2.0-or-later",
Expand Down

0 comments on commit 3222582

Please sign in to comment.