teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-15 04:05:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use wrapper stuff in GetBucketChannel.

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-01 11:32:10 +01:00
parent 042520e447
commit 1de75d2c0f
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/games/blood/src/eventq.cpp
View file

@ -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 = &sector[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;
}