[GEN][ZH] Annotate fallthrough between various switch case labels (#1085)

Author: xezon

Core/Libraries/Source/WWVegas/WWLib/always.h

@@ -46,7 +46,6 @@
 // TheSuperHackers @compile feliwir 17/04/2025 include utility macros for cross-platform compatibility
 #include <Utility/compat.h>
 #include <Utility/stdint_adapter.h>
-
 #include <Utility/CppMacros.h>
 
 // Disable warning about exception handling not being enabled. It's used as part of STL - in a part of STL we don't use.

Dependencies/Utility/Utility/CppMacros.h

@@ -21,8 +21,12 @@
 
 #if __cplusplus >= 201703L
 #define NOEXCEPT_17 noexcept
+#define REGISTER
+#define FALLTHROUGH [[fallthrough]]
 #else
 #define NOEXCEPT_17
+#define REGISTER register
+#define FALLTHROUGH
 #endif
 
 // noexcept for methods of IUNKNOWN interface
@@ -38,12 +42,6 @@
     #define CPP_11(code)
 #endif
 
-#if __cplusplus >= 201703L
-#define REGISTER
-#else
-#define REGISTER register
-#endif
-
 #if __cplusplus < 201103L
 #define static_assert(expr, msg)
 #endif

Generals/Code/GameEngine/Source/Common/RandomValue.cpp

@@ -383,6 +383,7 @@ Real GameClientRandomVariable::getValue( void ) const
 			if (m_low == m_high) {
 				return m_low;
 			} // else return as though a UNIFORM.
+			FALLTHROUGH;
 
 		case UNIFORM:
 			return GameClientRandomValueReal( m_low, m_high );
@@ -427,6 +428,7 @@ Real GameLogicRandomVariable::getValue( void ) const
 			if (m_low == m_high) {
 				return m_low;
 			} // else return as though a UNIFORM.
+			FALLTHROUGH;
 
 		case UNIFORM:
 			return GameLogicRandomValueReal( m_low, m_high );

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp

@@ -1877,20 +1877,23 @@ void grabSinglePlayerInfo( void )
 	{
 		Bool isFriend = TRUE;
 
-		// set the string we'll be compairing to
+		// set the string we'll be comparing to
 		switch (j) {
 		case USA_ENEMY:
 			isFriend = FALSE;
+			FALLTHROUGH;
 		case USA_FRIEND:
 			side.set("America");
 			break;
 		case CHINA_ENEMY:
 			isFriend = FALSE;
+			FALLTHROUGH;
 		case CHINA_FRIEND:
 			side.set("China");
 			break;
 		case GLA_ENEMY:
-			isFriend = FALSE;	
+			isFriend = FALSE;
+			FALLTHROUGH;
 		case GLA_FRIEND:
 			side.set("GLA");
 			break;

Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp

@@ -142,6 +142,8 @@ void FlashTransition::update( Int frame )
 			}  // end if
 
 		}
+		FALLTHROUGH;
+
 	case FLASHTRANSITION_FADE_IN_2:
 	case FLASHTRANSITION_FADE_IN_3:
 		{
@@ -810,8 +812,8 @@ void ScaleUpTransition::update( Int frame )
 				TheAudio->addAudioEvent( &buttonClick );
 			}  // end if
 
-			
 		}
+		FALLTHROUGH;
 
 	case SCALEUPTRANSITION_2:
 	case SCALEUPTRANSITION_3:
@@ -933,8 +935,8 @@ void ScoreScaleUpTransition::update( Int frame )
 				TheAudio->addAudioEvent( &buttonClick );
 			}  // end if
 
-			
 		}
+		FALLTHROUGH;
 
 	case SCORESCALEUPTRANSITION_2:
 	case SCORESCALEUPTRANSITION_3:

Generals/Code/GameEngine/Source/GameClient/GameText.cpp

@@ -630,6 +630,7 @@ void GameTextManager::readToEndOfQuote( File *file, Char *in, Char *out, Char *w
 				}
 
 				state = 1;
+				FALLTHROUGH;
 			case 1:
 				if ( ( ch >= 'a' && ch <= 'z') || ( ch >= 'A' && ch <='Z') || (ch >= '0' && ch <= '9') || ch == '_' )
 				{
@@ -638,6 +639,7 @@ void GameTextManager::readToEndOfQuote( File *file, Char *in, Char *out, Char *w
 					break;
 				}
 				state = 2;
+				FALLTHROUGH;
 			case 2:
 				break;
 		}

Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp

@@ -204,7 +204,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 				//If we release the button outside
 				forceKeepMessage = TRUE;
 			}
-			//FALL THROUGH INTENTIONALLY!
+			FALLTHROUGH; //FALL THROUGH INTENTIONALLY!
 		}
 		case GameMessage::MSG_RAW_MOUSE_POSITION:
 		case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_DOWN:

Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp

@@ -494,28 +494,28 @@ StateReturnType HackInternetState::update()
 						{
 							break;
 						}
-						//If entry missing, fall through!
+						FALLTHROUGH; //If entry missing, fall through!
 					case LEVEL_ELITE:
 						amount = ai->getEliteCashAmount();
 						if( amount )
 						{
 							break;
 						}
-						//If entry missing, fall through!
+						FALLTHROUGH; //If entry missing, fall through!
 					case LEVEL_VETERAN:
 						amount = ai->getVeteranCashAmount();
 						if( amount )
 						{
 							break;
 						}
-						//If entry missing, fall through!
+						FALLTHROUGH; //If entry missing, fall through!
 					case LEVEL_REGULAR:
 						amount = ai->getRegularCashAmount();
 						if( amount )
 						{
 							break;
 						}
-						//If entry missing, fall through!
+						FALLTHROUGH; //If entry missing, fall through!
 					default:
 						amount = 1;
 						break;

Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp

@@ -2216,7 +2216,7 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 				if (isParkedAt(parms->m_obj))
 					return;
 
-				// else fall thru to the default case!
+				FALLTHROUGH; // else fall thru to the default case!
 
 			default:
 			{

Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp

@@ -652,6 +652,8 @@ UpdateSleepTime MissileAIUpdate::update()
 			{
 				break;
 			}
+			FALLTHROUGH;
+
 		case IGNITION:
 			doIgnitionState();
 			break;