remove a few g references

This commit is contained in:
Tyfon
2024-06-25 15:39:48 -07:00
parent a6e622013e
commit 1f8f1d3f85
2 changed files with 8 additions and 8 deletions

View File

@@ -16,7 +16,7 @@ namespace UIFixes
// Recreatign this function to add the comment section, so calling this with simulate = false doesn't break everything // Recreatign this function to add the comment section, so calling this with simulate = false doesn't break everything
[PatchPrefix] [PatchPrefix]
[HarmonyPriority(Priority.Last)] [HarmonyPriority(Priority.Last)]
public static bool Prefix(TraderControllerClass __instance, ItemContextAbstractClass itemContext, Item targetItem, bool partialTransferOnly, bool simulate, ref GStruct413 __result) public static bool Prefix(TraderControllerClass __instance, ItemContextAbstractClass itemContext, Item targetItem, bool partialTransferOnly, bool simulate, ref object __result)
{ {
TraderControllerClass.Struct754 opStruct; TraderControllerClass.Struct754 opStruct;
opStruct.targetItem = targetItem; opStruct.targetItem = targetItem;
@@ -37,7 +37,7 @@ namespace UIFixes
return false; return false;
} }
GStruct413 operation = __instance.method_22(ref error, ref opStruct); var operation = __instance.method_22(ref error, ref opStruct);
if (operation.Succeeded) if (operation.Succeeded)
{ {
__result = operation; __result = operation;
@@ -47,7 +47,7 @@ namespace UIFixes
if (opStruct.targetItem is GInterface306 applicable) if (opStruct.targetItem is GInterface306 applicable)
{ {
GStruct413 operation = __instance.method_23(applicable, ref error, ref opStruct); var operation = __instance.method_23(applicable, ref error, ref opStruct);
if (operation.Succeeded) if (operation.Succeeded)
{ {
if (itemContext.IsOperationAllowed(operation.Value)) if (itemContext.IsOperationAllowed(operation.Value))
@@ -67,7 +67,7 @@ namespace UIFixes
if (mergeAvailable && splitAvailable) if (mergeAvailable && splitAvailable)
{ {
GStruct413 operation = __instance.method_24(ref error, ref opStruct); var operation = __instance.method_24(ref error, ref opStruct);
if (operation.Succeeded) if (operation.Succeeded)
{ {
__result = operation; __result = operation;

View File

@@ -27,12 +27,12 @@ namespace UIFixes
item.GetAllItemsNonAlloc(___list_2, false, true); item.GetAllItemsNonAlloc(___list_2, false, true);
foreach (Item item2 in ___list_2) foreach (Item item2 in ___list_2)
{ {
foreach (GEventArgs1 geventArgs in __instance.List_0) foreach (var eventArgs in __instance.List_0)
{ {
ItemAddress location = geventArgs.GetLocation(); ItemAddress location = eventArgs.GetLocation();
if (!geventArgs.OwnerId.Equals(anotherOwner.ID) && !geventArgs.OwnerId.Equals(__instance.ID)) // checking against this is what I changed if (!eventArgs.OwnerId.Equals(anotherOwner.ID) && !eventArgs.OwnerId.Equals(__instance.ID)) // checking against this is what I changed
{ {
if (item2 == geventArgs.Item) if (item2 == eventArgs.Item)
{ {
__result = true; __result = true;
return false; return false;