Revamp pyro burn system - only burn level 1 is possible, from flameth…

…rower or napalm nade. Shooting the IC at an on-fire target does bonus damage now.
fortressforever · May 31, 2016 · 74fad28 · 74fad28
1 parent bfadc4a
commit 74fad28
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/dlls/ff/ff_player.cpp b/dlls/ff/ff_player.cpp
@@ -4800,13 +4800,14 @@ void CFFPlayer::ApplyBurning( CFFPlayer *hIgniter, float scale, float flIconDura
 		case BURNTYPE_ICCANNON: m_bBurnFlagIC= true; break;
 	}
 
-	int newburnlevel = 0;
-	if (m_bBurnFlagNG == true) 
-		++newburnlevel;
-	if (m_bBurnFlagFT == true) 
-		++newburnlevel;
-	if (m_bBurnFlagIC == true) 
-		++newburnlevel;
+	// No more burn levels
+	int newburnlevel = 1;
+	//if (m_bBurnFlagNG == true) 
+	//	++newburnlevel;
+	//if (m_bBurnFlagFT == true) 
+	//	++newburnlevel;
+	//if (m_bBurnFlagIC == true) 
+	//	++newburnlevel;
 
 	if(oldburnlevel != newburnlevel)
 		Omnibot::Notify_BurnLevel(this, hIgniter, newburnlevel);

diff --git a/game_shared/ff/ff_projectile_incendiaryrocket.cpp b/game_shared/ff/ff_projectile_incendiaryrocket.cpp
@@ -76,7 +76,10 @@ void CFFProjectileIncendiaryRocket::Explode(trace_t *pTrace, int bitsDamageType)
 		CFFPlayer *pPlayer = ToFFPlayer( pEntity );
 		if( g_pGameRules->FCanTakeDamage( pPlayer, pBurninator ) )
 		{
-			pPlayer->ApplyBurning(pBurninator, 0.5f, 10.0f, BURNTYPE_ICCANNON);
+			if (pPlayer->IsBurning())
+			{
+				pPlayer->TakeDamage(CTakeDamageInfo( this, pBurninator, 40.0f, DMG_BURN ) );
+			}
 		}
 	}