zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- some remaining RXBUCKET access in nnexts.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-23 18:35:32 +01:00
parent f775fe577c
commit 10dc47a9bf
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7173,7 +7173,7 @@ void playerQavSceneProcess(PLAYER* pPlayer, QAVSCENE* pQavScene)
{ {
for (int i = bucketHead[pXSprite->txID]; i < bucketHead[pXSprite->txID + 1]; i++) for (int i = bucketHead[pXSprite->txID]; i < bucketHead[pXSprite->txID + 1]; i++)
{ {
if (rxBucket[i].type == OBJ_SPRITE) if (rxBucket[i].isActor())
{ {
auto rxactor = rxBucket[i].actor(); auto rxactor = rxBucket[i].actor();
if (!rxactor || !rxactor->hasX() || rxactor == initiator) continue; if (!rxactor || !rxactor->hasX() || rxactor == initiator) continue;
@ -8979,8 +8979,10 @@ DBloodActor* evrListRedirectors(int objType, int objIndex, DBloodActor* objActor
bool prevFound = false; bool prevFound = false;
for (int i = bucketHead[id]; i < bucketHead[id + 1]; i++) for (int i = bucketHead[id]; i < bucketHead[id + 1]; i++)
{ {
if (rxBucket[i].type != OBJ_SPRITE) continue; if (!rxBucket[i].isActor()) continue;
auto pXSpr = evrIsRedirector(rxBucket[i].rxactor); auto rxactor = rxBucket[i].actor();
auto pXSpr = evrIsRedirector(rxactor);
if (!pXSpr) continue; if (!pXSpr) continue;
else if (prevFound || pXRedir == nullptr) else if (prevFound || pXRedir == nullptr)
{ {
@ -9012,7 +9014,10 @@ bool incDecGoalValueIsReached(DBloodActor* actor)
for (int i = bucketHead[pXSprite->txID]; i < bucketHead[pXSprite->txID + 1]; i++) for (int i = bucketHead[pXSprite->txID]; i < bucketHead[pXSprite->txID + 1]; i++)
{ {
if (rxBucket[i].type == OBJ_SPRITE && evrIsRedirector(rxBucket[i].rxactor)) continue; if (!rxBucket[i].isActor()) continue;
auto rxactor = rxBucket[i].actor();
if (evrIsRedirector(rxactor)) continue;
for (int a = 0; a < len; a++) for (int a = 0; a < len; a++)
{ {
if (getDataFieldOfObject(rxBucket[i].type, rxBucket[i].rxindex, rxBucket[i].rxactor, (buffer[a] - 52) + 4) != pXSprite->data3) if (getDataFieldOfObject(rxBucket[i].type, rxBucket[i].rxindex, rxBucket[i].rxactor, (buffer[a] - 52) + 4) != pXSprite->data3)