zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 04:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

- need to pass the actor separately to getDataFieldOfObject.

Browse source 
We cannot use rxindex anymore.
This commit is contained in:
Christoph Oelckers 2021-08-30 21:43:21 +02:00
parent e32ac93d96
commit 0ab33b7ffe
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3514,7 +3514,7 @@ bool condCheckMixed(XSPRITE* pXCond, EVENT event, int cmpOp, bool PUSH) {
switch (cond) {
case 41: case 42:
case 43: case 44:
return condCmp(getDataFieldOfObject(OBJ_SPRITE, objIndex, 1 + cond - 41), arg1, arg2, cmpOp);
return condCmp(getDataFieldOfObject(OBJ_SPRITE, objIndex, &bloodActors[objIndex], 1 + cond - 41), arg1, arg2, cmpOp);
case 50: return condCmp(pXObj->rxID, arg1, arg2, cmpOp);
case 51: return condCmp(pXObj->txID, arg1, arg2, cmpOp);
case 52: return pXObj->locked;
@ -5603,7 +5603,7 @@ void useIncDecGen(XSPRITE* pXSource, short objType, int objIndex) {
for (int i = 0; i < len; i++) {
dataIndex = (buffer[i] - 52) + 4;
if ((data = getDataFieldOfObject(objType, objIndex, dataIndex)) == -65535) {
if ((data = getDataFieldOfObject(objType, objIndex, &bloodActors[objIndex], dataIndex)) == -65535) {
Printf(PRINT_HIGH, "\nWrong index of data (%c) for IncDec Gen #%d! Only 1, 2, 3 and 4 indexes allowed!\n", buffer[i], objIndex);
continue;
}
@ -6395,19 +6395,23 @@ bool isActive(int nSprite) {
}
}
int getDataFieldOfObject(int objType, int objIndex, int dataIndex) {
int getDataFieldOfObject(int objType, int objIndex, DBloodActor* actor, int dataIndex)
{
int data = -65535;
switch (objType) {
switch (objType)
{
case OBJ_SPRITE:
switch (dataIndex) {
case 1: return xsprite[sprite[objIndex].extra].data1;
case 2: return xsprite[sprite[objIndex].extra].data2;
switch (dataIndex)
{
case 1: return actor->x().data1;
case 2: return actor->x().data2;
case 3:
switch (sprite[objIndex].type) {
case kDudeModernCustom: return xsprite[sprite[objIndex].extra].sysData1;
default: return xsprite[sprite[objIndex].extra].data3;
switch (actor->s().type)
{
case kDudeModernCustom: return actor->x().sysData1;
default: return actor->x().data3;
}
case 4:return xsprite[sprite[objIndex].extra].data4;
case 4: return actor->x().data4;
default: return data;
}
case OBJ_SECTOR: return xsector[sector[objIndex].extra].data;
@ -7804,7 +7808,7 @@ bool incDecGoalValueIsReached(XSPRITE* pXSprite) {
for (int i = bucketHead[pXSprite->txID]; i < bucketHead[pXSprite->txID + 1]; i++) {
if (rxBucket[i].type == OBJ_SPRITE && evrIsRedirector(rxBucket[i].GetActor())) continue;
for (int a = 0; a < len; a++) {
if (getDataFieldOfObject(rxBucket[i].type, rxBucket[i].rxindex, (buffer[a] - 52) + 4) != pXSprite->data3)
if (getDataFieldOfObject(rxBucket[i].type, rxBucket[i].rxindex, rxBucket[i].actor, (buffer[a] - 52) + 4) != pXSprite->data3)
return false;
}
}
@ -7813,7 +7817,7 @@ bool incDecGoalValueIsReached(XSPRITE* pXSprite) {
while ((pXRedir = evrListRedirectors(OBJ_SPRITE, sprite[pXSprite->reference].extra, pXRedir, &rx)) != NULL) {
for (int i = bucketHead[rx]; i < bucketHead[rx + 1]; i++) {
for (int a = 0; a < len; a++) {
if (getDataFieldOfObject(rxBucket[i].type, rxBucket[i].rxindex, (buffer[a] - 52) + 4) != pXSprite->data3)
if (getDataFieldOfObject(rxBucket[i].type, rxBucket[i].rxindex, rxBucket[i].actor, (buffer[a] - 52) + 4) != pXSprite->data3)
return false;
}
}

2
source/games/blood/src/nnexts.h
View file

@ -397,7 +397,7 @@ bool valueIsBetween(int val, int min, int max);
bool IsBurningDude(spritetype* pSprite);
bool IsKillableDude(spritetype* pSprite);
bool isActive(int nSprite);
int getDataFieldOfObject(int objType, int objIndex, int dataIndex);
int getDataFieldOfObject(int objType, int objIndex, DBloodActor* objActor, int dataIndex);
bool setDataValueOfObject(int objType, int objIndex, int dataIndex, int value);
bool incDecGoalValueIsReached(XSPRITE* pXSprite);
void windGenStopWindOnSectors(XSPRITE* pXSource);