[iortcw] 10/497: All: Fix flamethrower stream sound (Still missing when using vanilla MP cgame)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 2254bc643771aecc5a6df30a45a69b5addc54f7a
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Sun Jan 19 12:43:19 2014 +0000

    All: Fix flamethrower stream sound (Still missing when using vanilla MP cgame)
---
 MP/code/cgame/cg_flamethrower.c | 12 ++++++------
 SP/code/cgame/cg_flamethrower.c | 13 +------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/MP/code/cgame/cg_flamethrower.c b/MP/code/cgame/cg_flamethrower.c
index 482ecae..cc8fa7f 100644
--- a/MP/code/cgame/cg_flamethrower.c
+++ b/MP/code/cgame/cg_flamethrower.c
@@ -1360,7 +1360,7 @@ CG_UpdateFlamethrowerSounds
 ===============
 */
 void CG_UpdateFlamethrowerSounds( void ) {
-	flameChunk_t *f, *trav; // , *lastSoundFlameChunk=NULL; // TTimo: unused
+	flameChunk_t *f; //, *trav; // , *lastSoundFlameChunk=NULL; // TTimo: unused
 	#define MIN_BLOW_VOLUME     30
 
 	// draw each of the headFlameChunk's
@@ -1387,12 +1387,12 @@ void CG_UpdateFlamethrowerSounds( void ) {
 		}
 
 		// traverse the chunks, spawning flame sound sources as we go
-		for ( trav = f; trav; trav = trav->nextFlameChunk ) {
+//		for ( trav = f; trav; trav = trav->nextFlameChunk ) {
 			// update the sound volume
-			if ( trav->blueLife + 100 < ( cg.time - trav->timeStart ) ) {
-				CG_S_AddLoopingSound( trav->ownerCent, trav->org, vec3_origin, cgs.media.flameSound, (int)( 255.0 * ( 0.2 * ( trav->size / FLAME_MAX_SIZE ) ) ) );
-			}
-		}
+//			if ( trav->blueLife + 100 < ( cg.time - trav->timeStart ) ) {
+//				CG_S_AddLoopingSound( trav->ownerCent, trav->org, vec3_origin, cgs.media.flameSound, (int)( 255.0 * ( 0.2 * ( trav->size / FLAME_MAX_SIZE ) ) ) );
+//			}
+//		}
 
 		f = f->nextHead;
 	}
diff --git a/SP/code/cgame/cg_flamethrower.c b/SP/code/cgame/cg_flamethrower.c
index 46aa688..8f445d3 100644
--- a/SP/code/cgame/cg_flamethrower.c
+++ b/SP/code/cgame/cg_flamethrower.c
@@ -1539,7 +1539,7 @@ CG_UpdateFlamethrowerSounds
 ===============
 */
 void CG_UpdateFlamethrowerSounds( void ) {
-	flameChunk_t *f, *trav;
+	flameChunk_t *f;
 	//flameChunk_t *lastSoundFlameChunk=NULL; // TTimo: unused
 	int i;
 	centity_t *cent;
@@ -1574,17 +1574,6 @@ void CG_UpdateFlamethrowerSounds( void ) {
 			centFlameInfo[f->ownerCent].lastSoundUpdate = cg.time;
 		}
 
-		// traverse the chunks, spawning flame sound sources as we go
-		for ( trav = f; trav; trav = trav->nextFlameChunk ) {
-			// update the sound volume
-			if ( trav->blueLife + 100 < ( cg.time - trav->timeStart ) ) {
-				//if (!lastSoundFlameChunk || Distance( lastSoundFlameChunk->org, trav->org ) > lastSoundFlameChunk->size) {
-				CG_S_AddLoopingSound( trav->ownerCent, trav->org, vec3_origin, cgs.media.flameSound, (int)( 255.0 * ( 0.2 * ( trav->size / FLAME_MAX_SIZE ) ) ) );
-				//	lastSoundFlameChunk = trav;
-				//}
-			}
-		}
-
 		f = f->nextHead;
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git