Skip to content

Commit 8d171a6

Browse files
author
Alex Dunn
committed
Remove unused type variable
1 parent eca704b commit 8d171a6

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

skaar_skse_plugin/skaar_skse_plugin/SkaarSpecialInventoryCrafting.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class ExtraContainerInfo {
7070
}
7171

7272
// Take an EntryDataList and self. Any item in self that isn't already in the given EntryDataList will be added to that list
73-
ExtraContainerChanges::EntryDataList *SkaarAddRemainingItems(ExtraContainerChanges::EntryDataList *currentEntries, FormType type) {
73+
ExtraContainerChanges::EntryDataList *SkaarAddRemainingItems(ExtraContainerChanges::EntryDataList *currentEntries) {
7474
// Iterate through all the items in self
7575
ExtraDataVec::iterator iteratorPosition = m_vec.begin();
7676
ExtraDataVec::iterator iteratorEnd = m_vec.end();
@@ -92,7 +92,7 @@ class ExtraContainerInfo {
9292

9393
namespace SkaarSpecialInventoryCrafting {
9494
ExtraContainerInfo SkaarItemInfoForObjectReference(TESObjectREFR* pContainerRef);
95-
ExtraContainerChanges::EntryDataList *SkaarAddRemainingItems(ExtraContainerChanges::EntryDataList *currentItems, TESObjectREFR *pContainerRef, FormType type);
95+
ExtraContainerChanges::EntryDataList *SkaarAddRemainingItems(ExtraContainerChanges::EntryDataList *currentItems, TESObjectREFR *pContainerRef);
9696
bool SkaarEntryDataListContainsEntryData(ExtraContainerChanges::EntryDataList *entryDataList, ExtraContainerChanges::EntryData *entry);
9797
ExtraContainerChanges::EntryDataList *SkaarGetAllItems(TESObjectREFR* container, FormType type);
9898

@@ -145,7 +145,7 @@ namespace SkaarSpecialInventoryCrafting {
145145
}
146146

147147
// Put into the list those items that were already on the destination but not in the source so they aren't lost
148-
newEntryDataList = SkaarAddRemainingItems(newEntryDataList, pDestContainerRef, type);
148+
newEntryDataList = SkaarAddRemainingItems(newEntryDataList, pDestContainerRef);
149149

150150
_DMESSAGE("About to add ExtraContainerChanges to the player that has %d items in it", newEntryDataList->Count());
151151
ExtraContainerChanges* pXDestContainerChanges = static_cast<ExtraContainerChanges*>(pDestContainerRef->extraData.GetByType(kExtraData_ContainerChanges));
@@ -186,9 +186,10 @@ namespace SkaarSpecialInventoryCrafting {
186186
}
187187
}
188188

189-
ExtraContainerChanges::EntryDataList *SkaarAddRemainingItems(ExtraContainerChanges::EntryDataList *currentItems, TESObjectREFR *pContainerRef, FormType type) {
189+
// TODO: The SkaarAddRemainingItems functions above in the other namespace ought to be merged into this
190+
ExtraContainerChanges::EntryDataList *SkaarAddRemainingItems(ExtraContainerChanges::EntryDataList *currentItems, TESObjectREFR *pContainerRef) {
190191
ExtraContainerInfo containerInfo = SkaarItemInfoForObjectReference(pContainerRef);
191-
return containerInfo.SkaarAddRemainingItems(currentItems, type);
192+
return containerInfo.SkaarAddRemainingItems(currentItems);
192193
}
193194

194195
// Get the items info object for a given container object reference

skaar_skse_plugin/skaar_skse_plugin/skaar_skse_plugin.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
6666
<PrecompiledHeader>
6767
</PrecompiledHeader>
68-
<WarningLevel>Level3</WarningLevel>
68+
<WarningLevel>Level4</WarningLevel>
6969
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
7070
<ForcedIncludeFiles>common/IPrefix.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
7171
</ClCompile>

0 commit comments

Comments
 (0)