diff --git a/source/exhumed/src/anubis.cpp b/source/exhumed/src/anubis.cpp index c3892fd31..57becb13c 100644 --- a/source/exhumed/src/anubis.cpp +++ b/source/exhumed/src/anubis.cpp @@ -248,6 +248,7 @@ void FuncAnubis(int a, int nDamage, int nRun) break; // only break if condition met } // else we fall through to 0x8000 + fallthrough__; } case 0x8000: { @@ -406,6 +407,7 @@ void FuncAnubis(int a, int nDamage, int nRun) } nDamage = runlist_CheckRadialDamage(nSprite); + fallthrough__; } case 0x80000: { diff --git a/source/exhumed/src/fish.cpp b/source/exhumed/src/fish.cpp index 550eee688..60d690589 100644 --- a/source/exhumed/src/fish.cpp +++ b/source/exhumed/src/fish.cpp @@ -351,6 +351,7 @@ void FuncFish(int a, int nDamage, int nRun) FishList[nFish].field_C = 10; } // fall through + fallthrough__; } case 0x80000: { diff --git a/source/exhumed/src/gun.cpp b/source/exhumed/src/gun.cpp index 4c084a4a5..436d7b3cc 100644 --- a/source/exhumed/src/gun.cpp +++ b/source/exhumed/src/gun.cpp @@ -827,6 +827,7 @@ loc_flag: } // fall through to case 1 (kWeaponPistol) + fallthrough__; } } @@ -836,6 +837,7 @@ loc_flag: nQuake[nPlayer] = 128; } // fall through + fallthrough__; } case kWeaponPistol: { diff --git a/source/exhumed/src/init.cpp b/source/exhumed/src/init.cpp index 7d36a24ab..e48fb4817 100644 --- a/source/exhumed/src/init.cpp +++ b/source/exhumed/src/init.cpp @@ -481,6 +481,7 @@ void ProcessSpriteTag(short nSprite, short lotag, short hitag) { nVal = 3 * (hitag / 3); // fall through to 6,7 etc + fallthrough__; } case 6: case 7: diff --git a/source/exhumed/src/lion.cpp b/source/exhumed/src/lion.cpp index 0bfe7517b..43a0a8bd5 100644 --- a/source/exhumed/src/lion.cpp +++ b/source/exhumed/src/lion.cpp @@ -152,6 +152,7 @@ void FuncLion(int a, int nDamage, int nRun) { nDamage = runlist_CheckRadialDamage(nSprite); // now fall through to 0x80000 + fallthrough__; } case 0x80000: { diff --git a/source/exhumed/src/mummy.cpp b/source/exhumed/src/mummy.cpp index a014aa6a9..dda748726 100644 --- a/source/exhumed/src/mummy.cpp +++ b/source/exhumed/src/mummy.cpp @@ -479,6 +479,7 @@ void FuncMummy(int a, int nDamage, int nRun) nDamage = runlist_CheckRadialDamage(nSprite); // fall through to 0x80000 + fallthrough__; } case 0x80000: { diff --git a/source/exhumed/src/object.cpp b/source/exhumed/src/object.cpp index 4a085abad..f2763f16d 100644 --- a/source/exhumed/src/object.cpp +++ b/source/exhumed/src/object.cpp @@ -1791,6 +1791,7 @@ void FuncEnergyBlock(int a, int nDamage, int nRun) } // fall through to case 0x80000 + fallthrough__; } case 0x80000: diff --git a/source/exhumed/src/player.cpp b/source/exhumed/src/player.cpp index 287edb6b2..c9688ddd1 100644 --- a/source/exhumed/src/player.cpp +++ b/source/exhumed/src/player.cpp @@ -1103,6 +1103,7 @@ void FuncPlayer(int pA, int nDamage, int nRun) nSprite2 = nRadialOwner; // fall through to case 0x80000 + fallthrough__; } case 0x80000: diff --git a/source/exhumed/src/rat.cpp b/source/exhumed/src/rat.cpp index c8547f0a5..791961c3d 100644 --- a/source/exhumed/src/rat.cpp +++ b/source/exhumed/src/rat.cpp @@ -199,6 +199,7 @@ void FuncRat(int a, int nDamage, int nRun) { nDamage = runlist_CheckRadialDamage(nSprite); // fall through to 0x80000 + fallthrough__; } case 0x80000: { diff --git a/source/exhumed/src/rex.cpp b/source/exhumed/src/rex.cpp index 9e56f3256..b94fd3f44 100644 --- a/source/exhumed/src/rex.cpp +++ b/source/exhumed/src/rex.cpp @@ -156,6 +156,7 @@ void FuncRex(int a, int nDamage, int nRun) nDamage = runlist_CheckRadialDamage(nSprite); } // fall through to case 0x80000 + fallthrough__; } case 0x80000: diff --git a/source/exhumed/src/roach.cpp b/source/exhumed/src/roach.cpp index f3097c402..138c8d347 100644 --- a/source/exhumed/src/roach.cpp +++ b/source/exhumed/src/roach.cpp @@ -163,6 +163,7 @@ void FuncRoach(int a, int nDamage, int nRun) case 0xA0000: // fall through to next case { nDamage = runlist_CheckRadialDamage(nSprite); + fallthrough__; } case 0x80000: { diff --git a/source/exhumed/src/runlist.cpp b/source/exhumed/src/runlist.cpp index fe0c6fbe0..b29587170 100644 --- a/source/exhumed/src/runlist.cpp +++ b/source/exhumed/src/runlist.cpp @@ -1311,6 +1311,7 @@ void runlist_ProcessSectorTag(int nSector, int lotag, int hitag) runlist_AddRunRec(sRunChannels[nChannel].a, nSwitch); // Fall through to case 62 + fallthrough__; } case 62: { diff --git a/source/exhumed/src/scorp.cpp b/source/exhumed/src/scorp.cpp index 4d3633f97..b284405d2 100644 --- a/source/exhumed/src/scorp.cpp +++ b/source/exhumed/src/scorp.cpp @@ -159,6 +159,7 @@ void FuncScorp(int a, int nDamage, int nRun) return; } // else fall through to case 0x80000 + fallthrough__; } case 0x80000: diff --git a/source/exhumed/src/set.cpp b/source/exhumed/src/set.cpp index 9afc88813..4c6034468 100644 --- a/source/exhumed/src/set.cpp +++ b/source/exhumed/src/set.cpp @@ -250,6 +250,7 @@ void FuncSet(int a, int nDamage, int nRun) nDamage = runlist_CheckRadialDamage(nSprite); // fall through to case 0x80000 } + fallthrough__; } case 0x80000: diff --git a/source/exhumed/src/spider.cpp b/source/exhumed/src/spider.cpp index b93d2ba25..e91f5c289 100644 --- a/source/exhumed/src/spider.cpp +++ b/source/exhumed/src/spider.cpp @@ -212,6 +212,7 @@ goto case_3; SpiderList[nSpider].nAction = 1; } //break; // fall through + fallthrough__; } case 3: { @@ -388,6 +389,7 @@ case_3: nDamage = runlist_CheckRadialDamage(nSprite); // fall through + fallthrough__; } case 0x80000: diff --git a/source/exhumed/src/wasp.cpp b/source/exhumed/src/wasp.cpp index f7daca650..57ddd6824 100644 --- a/source/exhumed/src/wasp.cpp +++ b/source/exhumed/src/wasp.cpp @@ -192,6 +192,7 @@ void FuncWasp(int a, int nDamage, int nRun) nDamage = runlist_CheckRadialDamage(nSprite); // fall through to case 0x80000 + fallthrough__; } case 0x80000: