From 1de75d2c0f4720f9f8207f5666a5403d246b913a Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 1 Dec 2021 11:32:10 +0100 Subject: [PATCH] - use wrapper stuff in GetBucketChannel. --- source/games/blood/src/eventq.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/source/games/blood/src/eventq.cpp b/source/games/blood/src/eventq.cpp index b46684a9d..90331f755 100644 --- a/source/games/blood/src/eventq.cpp +++ b/source/games/blood/src/eventq.cpp @@ -57,26 +57,25 @@ FString EventObject::description() const static int GetBucketChannel(const RXBUCKET* pBucket) { - switch (pBucket->type) + if (pBucket->isSector()) { - case SS_SECTOR: - { - auto pSector = §or[pBucket->rxindex]; + auto pSector = pBucket->sector(); assert(pSector->hasX()); return pSector->xs().rxID; } - case SS_WALL: + if (pBucket->isWall()) { - auto pWall = &wall[pBucket->rxindex]; + auto pWall = pBucket->wall(); assert(pWall->hasX()); return pWall->xw().rxID; } - - case SS_SPRITE: - return pBucket->actor()? pBucket->actor()->x().rxID : 0; + if (pBucket->isActor()) + { + auto pActor = pBucket->actor(); + return pActor? pActor->x().rxID : 0; } - Printf(PRINT_HIGH, "Unexpected rxBucket type %d", pBucket->type); + Printf(PRINT_HIGH, "Unexpected rxBucket %s", pBucket->description().GetChars()); return 0; }