From 40a8cd7fa34a13fc875586eb5b28efa953a181f0 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 1 Sep 2021 20:12:27 +0200
Subject: [PATCH] - playerQavSceneProcess handled for rxBuckets

---
 source/games/blood/src/nnexts.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/source/games/blood/src/nnexts.cpp b/source/games/blood/src/nnexts.cpp
index 8cfc7853e..dd7f6c59c 100644
--- a/source/games/blood/src/nnexts.cpp
+++ b/source/games/blood/src/nnexts.cpp
@@ -6185,7 +6185,8 @@ QAV* playerQavSceneLoad(int qavId) {
 
 void playerQavSceneProcess(PLAYER* pPlayer, QAVSCENE* pQavScene) {
     int nIndex = pQavScene->index;
-    if (xspriRangeIsFine(sprite[nIndex].extra)) {
+    auto qavactor = &bloodActors[nIndex];
+    if (qavactor->hasX()) {
         
         XSPRITE* pXSprite = &xsprite[sprite[nIndex].extra];
         if (pXSprite->waitTime > 0 && --pXSprite->sysData1 <= 0) {
@@ -6195,9 +6196,9 @@ void playerQavSceneProcess(PLAYER* pPlayer, QAVSCENE* pQavScene) {
                 for (int i = bucketHead[pXSprite->txID]; i < bucketHead[pXSprite->txID + 1]; i++) {
                     if (rxBucket[i].type == OBJ_SPRITE) {
                         
-                        spritetype* pSpr = &sprite[rxBucket[i].rxindex];
-                        if (pSpr->index == nIndex || !xspriRangeIsFine(pSpr->extra))
-                            continue;
+                        auto rxactor = rxBucket[i].GetActor();
+                        if (!rxactor || !rxactor->hasX() || rxactor == qavactor) continue;
+                        spritetype* pSpr = &rxactor->s();
 
                         pXSpr = &xsprite[pSpr->extra];
                         if (pSpr->type == kModernPlayerControl && pXSpr->command == 67) {
@@ -6205,10 +6206,10 @@ void playerQavSceneProcess(PLAYER* pPlayer, QAVSCENE* pQavScene) {
                             else trPlayerCtrlStartScene(pXSpr, pPlayer, true);
                             return;
                         }
+                        nnExtTriggerObject(rxBucket[i].type, rxactor->s().index, pXSprite->command);
 
                     }
-
-                    nnExtTriggerObject(rxBucket[i].type, rxBucket[i].rxindex, pXSprite->command);
+                    else nnExtTriggerObject(rxBucket[i].type, rxBucket[i].rxindex, pXSprite->command);
 
                 }
             } //else {