Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit a32a2dd282c7 · 2024-07-23T01:10:20.000Z
2bdac16 Fix #1927 Hydra flare doesn't work with createProjectile (#3600)
diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -7315,6 +7315,7 @@ CClientProjectile* CStaticFunctionDefinitions::CreateProjectile(CResource& Resou
                 case WEAPONTYPE_ROCKET_HS:
                 case WEAPONTYPE_FREEFALL_BOMB:
                 case WEAPONTYPE_REMOTE_SATCHEL_CHARGE:
+                case WEAPONTYPE_FLARE:
                 {
                     // Valid model ID? (0 means projectile will use default model)
                     if (usModel == 0 || CClientObjectManager::IsValidModel(usModel))

Original file line number	Diff line number	Diff line change
`@@ -7315,6 +7315,7 @@ CClientProjectile* CStaticFunctionDefinitions::CreateProjectile(CResource& Resou`
`7315`	`7315`	`case WEAPONTYPE_ROCKET_HS:`
`7316`	`7316`	`case WEAPONTYPE_FREEFALL_BOMB:`
`7317`	`7317`	`case WEAPONTYPE_REMOTE_SATCHEL_CHARGE:`
	`7318`	`+ case WEAPONTYPE_FLARE:`
`7318`	`7319`	`{`
`7319`	`7320`	`// Valid model ID? (0 means projectile will use default model)`
`7320`	`7321`	`if (usModel == 0 \|\| CClientObjectManager::IsValidModel(usModel))`