v1.9.3 - properly set "self" before "conditionFunc"

kirides · Mar 16, 2021 · b1b8695 · b1b8695
1 parent 2d9b352
commit b1b8695
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Ninja/Quickloot/CONTENT/Quickloot/INIT.D b/Ninja/Quickloot/CONTENT/Quickloot/INIT.D
@@ -1,4 +1,4 @@
-const string NINJA_QUICKLOOT_VERSION = "Quickloot v1.9.2"; 
+const string NINJA_QUICKLOOT_VERSION = "Quickloot v1.9.3"; 
 
 FUNC VOID _Ninja_Quickloot_NPC_CollectFocusVob (var C_NPC slfInstance, var int force) {
     var int npcPtr; npcPtr = MEM_InstToPtr(slfInstance);
@@ -312,7 +312,10 @@ func int _Ninja_Quickloot_Container_ConditionFunc(var oCMobContainer container)
 
 	var int symId; symId = MEM_FindParserSymbol(container._oCMobInter_conditionFunc);
 	if (symId != -1) {
+		var C_NPC oldSlf; oldSlf = MEM_CpyInst(self);
+		self = MEM_CpyInst(hero);
 		MEM_CallByID(symId);
+		self = MEM_CpyInst(oldSlf);
 		return +MEM_PopIntResult();
 	};
 
@@ -322,10 +325,10 @@ func int _Ninja_Quickloot_Container_ConditionFunc(var oCMobContainer container)
 func void _Ninja_Quickloot_Container_OnState(var string state, var int stateNo) {
 	var int symId; symId = MEM_FindParserSymbol(ConcatStrings(state, ConcatStrings("_S", IntToString(stateNo))));
 	if (symId != -1) {
-		var C_NPC oldSlf; oldSlf = Hlp_GetNpc(self);
-		self = Hlp_GetNpc(hero);
+		var C_NPC oldSlf; oldSlf = MEM_CpyInst(self);
+		self = MEM_CpyInst(hero);
 		MEM_CallByID(symId);
-		self = Hlp_GetNpc(oldSlf);
+		self = MEM_CpyInst(oldSlf);
 		oldSlf = MEM_NullToInst();
 	};
 };