teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 21:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- todo markers

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-14 01:40:46 +02:00
parent 3e9bcacc22
commit be0e2a9b93
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/games/blood/src/nnexts.cpp
View file

@ -3721,11 +3721,13 @@ void condPush(DBloodActor* actor, int objType, int objIndex, DBloodActor* objAct
case OBJ_SPRITE: r = kCondSerialSprite + objActor->GetIndex(); break; case OBJ_SPRITE: r = kCondSerialSprite + objActor->GetIndex(); break;
} }
if (r == -1) I_Error("Unknown object type %d, index %d", objType, objIndex); if (r == -1) I_Error("Unknown object type %d, index %d", objType, objIndex);
// condition-target
else actor->x().targetX = r; else actor->x().targetX = r;
} }
void condUnserialize(DBloodActor* serialActor, int* objType, int* objIndex, DBloodActor** objActor) { void condUnserialize(DBloodActor* serialActor, int* objType, int* objIndex, DBloodActor** objActor) {
// condition-target
int serial = serialActor->x().targetX; int serial = serialActor->x().targetX;
if (serial >= kCondSerialSector && serial < kCondSerialWall) { if (serial >= kCondSerialSector && serial < kCondSerialWall) {
@ -3760,11 +3762,13 @@ bool condPush(XSPRITE* pXSprite, int objType, int objIndex) {
void condBackup(DBloodActor* actor) void condBackup(DBloodActor* actor)
{ {
// condition-target
actor->x().targetY = actor->x().targetX; actor->x().targetY = actor->x().targetX;
} }
void condRestore(DBloodActor* actor) void condRestore(DBloodActor* actor)
{ {
// condition-target
actor->x().targetX = actor->x().targetY; actor->x().targetX = actor->x().targetY;
} }
@ -4779,6 +4783,8 @@ void condUpdateObjectIndex(DBloodActor* oldActor, DBloodActor* newActor)
while (auto iactor = it.Next()) while (auto iactor = it.Next())
{ {
XSPRITE* pXCond = &iactor->x(); XSPRITE* pXCond = &iactor->x();
// condition-target
// condition-target
if (pXCond->targetX == oldSerial) pXCond->targetX = newSerial; if (pXCond->targetX == oldSerial) pXCond->targetX = newSerial;
if (pXCond->targetY == oldSerial) pXCond->targetY = newSerial; if (pXCond->targetY == oldSerial) pXCond->targetY = newSerial;
@ -6300,6 +6306,7 @@ int useCondition(DBloodActor* sourceactor, const EVENT& event)
} }
else // or grab serials of objects from previous conditions else // or grab serials of objects from previous conditions
{ {
// condition-target
pXSource->targetX = event.actor->x().targetX; pXSource->targetX = event.actor->x().targetX;
pXSource->targetY = event.actor->x().targetY; pXSource->targetY = event.actor->x().targetY;
@ -6363,6 +6370,7 @@ int useCondition(DBloodActor* sourceactor, const EVENT& event)
} }
// send it for initial object // send it for initial object
// condition-target
if ((pSource->flags & kModernTypeFlag2) && (pXSource->targetX != pXSource->targetY || !(pSource->hitag & kModernTypeFlag1))) { if ((pSource->flags & kModernTypeFlag2) && (pXSource->targetX != pXSource->targetY || !(pSource->hitag & kModernTypeFlag1))) {
DBloodActor* objActor = nullptr; DBloodActor* objActor = nullptr;
condUnserialize(sourceactor, &objType, &objIndex, &objActor); condUnserialize(sourceactor, &objType, &objIndex, &objActor);