From c7ffed4867bc49c670419ab1075286ff02ab18e2 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Sat, 18 Jan 2020 21:18:08 +1100 Subject: [PATCH] Blood: change fallthrough annotations to fix clang build Remove some fallthrough annotations so clang does not fatally error: source/blood/src/aiunicult.cpp:1983:13: error: fallthrough annotation does not directly precede switch label source/blood/src/triggers.cpp:1045:33: error: fallthrough annotation does not directly precede switch label # Conflicts: # source/blood/src/aiunicult.cpp # source/blood/src/triggers.cpp --- source/blood/src/aiunicult.cpp | 1 - source/blood/src/triggers.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/source/blood/src/aiunicult.cpp b/source/blood/src/aiunicult.cpp index 6940349d8..44102939b 100644 --- a/source/blood/src/aiunicult.cpp +++ b/source/blood/src/aiunicult.cpp @@ -1987,7 +1987,6 @@ bool genDudePrepare(spritetype* pSprite, int propId) { pSprite->clipdist = ClipRange((pSprite->xrepeat + pSprite->yrepeat) >> 1, 4, 120); if (propId) break; - break; } } diff --git a/source/blood/src/triggers.cpp b/source/blood/src/triggers.cpp index 1b3b2a2e7..514702938 100644 --- a/source/blood/src/triggers.cpp +++ b/source/blood/src/triggers.cpp @@ -1045,7 +1045,6 @@ void OperateSprite(int nSprite, XSPRITE *pXSprite, EVENT event) case 4: for (int i = 0; i < 8; i++) pPlayer->hasKey[i] = false; if (pXSprite->data2) break; - break; } break;