- do not crunch condition info to an int.

Once the global sprite array is gone we need full actor info here.

source/games/blood/src/bloodactor.h

@@ -82,6 +82,26 @@ struct SPRITEHIT
 	Collision hit, ceilhit, florhit;
 };
 
+struct ConditionElement
+{
+	int type;
+	int index;
+	DBloodActor* actor;
+
+	bool operator==(const ConditionElement& other) const
+	{
+		if (type != other.type) return false;
+		if (type == kCondSerialSprite && actor != other.actor) return false;
+		if (type != kCondSerialSprite && index != other.index) return false;
+		return true;
+	}
+
+	bool operator!=(const ConditionElement& other) const
+	{
+		return !(operator==(other));
+	}
+
+};
 
 // Due to the messed up array storage of all the game data we cannot do any direct references here yet. We have to access everything via wrapper functions for now.
 // Note that the indexing is very inconsistent - partially by sprite index, partially by xsprite index.
@@ -100,7 +120,9 @@ public:
 	POINT3D basePoint;
 	int xvel, yvel, zvel;
 
-	int cumulDamage; // this one's transient and does not need to be saved.
+	// transient data (not written to savegame)
+	int cumulDamage;
+	ConditionElement condition[2];
 	bool explosionhackflag; // this originally hijacked the target field which is not safe when working with pointers.
 	bool interpolated;
 

source/games/blood/src/nnexts.cpp

@@ -3678,63 +3678,34 @@ void useSeqSpawnerGen(DBloodActor* sourceactor, int objType, int index, DBloodAc
 //
 //---------------------------------------------------------------------------
 
-int condSerialize(DBloodActor* objActor) 
+ConditionElement condSerialize(DBloodActor* objActor) 
 {
     // this one only gets used for players
-    return kCondSerialSprite + objActor->GetIndex();
+    return { kCondSerialSprite, -1, objActor };
 }
 
-void condPush(DBloodActor* actor, int objType, int objIndex, DBloodActor* objActor) {
+
-    int r = -1;
+bool condPush(DBloodActor* actor, int type, int index, DBloodActor* iactor)
-    switch (objType) {
+{
-    case OBJ_SECTOR: r = kCondSerialSector + objIndex; break;
+    actor->condition[0] = { type, index, actor };
-    case OBJ_WALL:   r = kCondSerialWall + objIndex; break;
+    return true;
-    case OBJ_SPRITE: r = kCondSerialSprite + objActor->GetIndex(); break;
-    }
-    if (r == -1) I_Error("Unknown object type %d, index %d", objType, objIndex);
-    // condition-target
-    else actor->x().targetX = r;
-    
 }
 
-void condUnserialize(DBloodActor* serialActor, int* objType, int* objIndex, DBloodActor** objActor) {
+void condUnserialize(DBloodActor* actor, int* objType, int* objIndex, DBloodActor** objActor) 
-    // condition-target
+{
-    int serial = serialActor->x().targetX;
+	*objType = actor->condition[0].type;
-    if (serial >= kCondSerialSector && serial < kCondSerialWall) {
+	*objIndex = actor->condition[0].index;
-        
+	*objActor = actor->condition[0].actor;
-        *objIndex = serial - kCondSerialSector;
-        *objType = OBJ_SECTOR; 
-        *objActor = nullptr;
-
-    } else if (serial >= kCondSerialWall && serial < kCondSerialSprite) {
-        
-        *objIndex = serial - kCondSerialWall;
-        *objType = OBJ_WALL; 
-        *objActor = nullptr;
-
-    } else if (serial >= kCondSerialSprite && serial < kCondSerialMax) {
-        
-        *objIndex = serial - kCondSerialSprite;
-        *objType = OBJ_SPRITE; 
-        *objActor = &bloodActors[*objIndex];
-
-    } else {
-        
-        I_Error("%d is not condition serial!", serial);
-
-    }
 }
 
 void condBackup(DBloodActor* actor)
 {
-    // condition-target
+    actor->condition[1] = actor->condition[0];
-    actor->x().targetY = actor->x().targetX;
 }
 
 void condRestore(DBloodActor* actor)
 {
-    // condition-target
+    actor->condition[0] = actor->condition[1];
-    actor->x().targetX = actor->x().targetY;
 }
 
 // normal comparison
@@ -4737,18 +4708,15 @@ void condUpdateObjectIndex(DBloodActor* oldActor, DBloodActor* newActor)
     }
 
     // puke...
-    int oldSerial = condSerialize(oldActor);
+    auto oldSerial = condSerialize(oldActor);
-    int newSerial = condSerialize(newActor);
+    auto newSerial = condSerialize(newActor);
 
     // then update serials
     BloodStatIterator it(kStatModernCondition);
-    while (auto iactor = it.Next())
+    while (auto iActor = it.Next())
     {
-        XSPRITE* pXCond = &iactor->x();
+        if (iActor->condition[0] == oldSerial) iActor->condition[0] = newSerial;
-        // condition-target
+        if (iActor->condition[1] == oldSerial) iActor->condition[1] = newSerial;
-        // condition-target
-        if (pXCond->targetX == oldSerial) pXCond->targetX = newSerial;
-        if (pXCond->targetY == oldSerial) pXCond->targetY = newSerial;
 
     }
 }
@@ -6261,9 +6229,8 @@ int useCondition(DBloodActor* sourceactor, const EVENT& event)
     } 
     else  // or grab serials of objects from previous conditions
     {
-        // condition-target
+        sourceactor->condition[0] = event.actor->condition[0];
-        pXSource->targetX = event.actor->x().targetX;
+        sourceactor->condition[1] = event.actor->condition[1];
-        pXSource->targetY = event.actor->x().targetY;
 
     }
     
@@ -6325,8 +6292,7 @@ int useCondition(DBloodActor* sourceactor, const EVENT& event)
             }
 
             // send it for initial object
-            // condition-target
+            if ((pSource->flags & kModernTypeFlag2) && (sourceactor->condition[0] != sourceactor->condition[1] || !(pSource->hitag & kModernTypeFlag1))) {
-            if ((pSource->flags & kModernTypeFlag2) && (pXSource->targetX != pXSource->targetY || !(pSource->hitag & kModernTypeFlag1))) {
                 DBloodActor* objActor = nullptr;
                 condUnserialize(sourceactor, &objType, &objIndex, &objActor);
                 nnExtTriggerObject(objType, objIndex, objActor, pXSource->command);