From c2049adaaacce20f417a65bc347548e853b30ec0 Mon Sep 17 00:00:00 2001 From: powerof3 <32599957+powerof3@users.noreply.github.com> Date: Sat, 2 Dec 2023 16:19:23 +0530 Subject: [PATCH] short circuit location filters for outfits --- .github/workflows/main.yml | 2 +- SPID/CMakeLists.txt | 2 +- SPID/src/LookupNPC.cpp | 2 +- SPID/vcpkg.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 07703a5..75f2419 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,4 +30,4 @@ jobs: PUBLISH_MOD_CHANGELOG_FILE: "FOMOD/changelog.txt" PUBLISH_MOD_DESCRIPTION_FILE: "FOMOD/description.txt" PUBLISH_ARCHIVE_TYPE: '7z' - VCPKG_COMMIT_ID: 'bb588985e37484d543fc849d0d79434e0d45bb3c' + VCPKG_COMMIT_ID: '16ee2ecb31788c336ace8bb14c21801efb6836e4' diff --git a/SPID/CMakeLists.txt b/SPID/CMakeLists.txt index b60b85e..fae75ac 100644 --- a/SPID/CMakeLists.txt +++ b/SPID/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.20) set(NAME "po3_SpellPerkItemDistributor" CACHE STRING "") -set(VERSION 6.7.2 CACHE STRING "") +set(VERSION 6.7.3 CACHE STRING "") set(AE_VERSION 1) set(VR_VERSION 1) diff --git a/SPID/src/LookupNPC.cpp b/SPID/src/LookupNPC.cpp index c042404..2b6b611 100644 --- a/SPID/src/LookupNPC.cpp +++ b/SPID/src/LookupNPC.cpp @@ -177,7 +177,7 @@ namespace NPC case RE::FormType::Location: { const auto location = a_form->As(); - return actor ? actor->GetEditorLocation() == location : false; + return actor ? actor->GetEditorLocation() == location : true; // Location filter cannot be used for outfit distr } case RE::FormType::FormList: { diff --git a/SPID/vcpkg.json b/SPID/vcpkg.json index 7eeb4ec..64c3ab7 100644 --- a/SPID/vcpkg.json +++ b/SPID/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spid", - "version-string": "6.7.2", + "version-string": "6.7.3", "description": "Spell Perk Item Distributor", "homepage": "https://github.com/powerof3/Spell-Perk-Item-Distributor", "license": "MIT",