slight refactoring

Author: Kitsune44

src/game/client/swarm/vgui/nb_header_footer.cpp

@@ -36,7 +36,6 @@ CASW_Background_Movie* ASWBackgroundMovie()
 CASW_Background_Movie::CASW_Background_Movie()
 {
 	m_nMaterialType = MATERIAL_INVALID;
-	m_nBIKMaterial = BIKMATERIAL_INVALID;
 	m_nTextureID = -1;
 	m_szCurrentMovie[0] = 0;
 	m_nLastGameState = -1;
@@ -113,7 +112,7 @@ void CASW_Background_Movie::SetCurrentMovie( const char *szFilename )
 				g_pWEBM->DestroyVideoMaterial( m_pWEBMMaterial );
 				break;
 			case MATERIAL_BIK:
-				g_pBIK->DestroyMaterial(m_nBIKMaterial);
+				g_pBIK->DestroyMaterial( m_nBIKMaterial );
 				break;
 			}
 			m_nMaterialType = MATERIAL_INVALID;
@@ -123,7 +122,6 @@ void CASW_Background_Movie::SetCurrentMovie( const char *szFilename )
 		const char* ext = Q_GetFileExtension(szFilename);
 		if (ext && !Q_stricmp(ext, "webm"))
 		{
-			// Utwórz materia³ WebM
 			char szMaterialName[MAX_PATH];
 			Q_snprintf(szMaterialName, sizeof(szMaterialName), "BackgroundWebMMaterial%i", g_pWEBM->GetUniqueMaterialID());
 
@@ -163,7 +161,7 @@ void CASW_Background_Movie::ClearCurrentMovie()
 			g_pWEBM->DestroyVideoMaterial( m_pWEBMMaterial );
 			break;
 		case MATERIAL_BIK:
-			g_pBIK->DestroyMaterial(m_nBIKMaterial);
+			g_pBIK->DestroyMaterial( m_nBIKMaterial );
 			break;
 		}
 		m_nMaterialType = MATERIAL_INVALID;
@@ -272,15 +270,8 @@ void CASW_Background_Movie::Update( bool bForce )
 
 		if ( !m_pWEBMMaterial->Update() )
 		{
-			if ( m_pWEBMMaterial->IsLooping() )
-			{
-				m_pWEBMMaterial->SetTime( 0.0f );
-			}
-			else
-			{
-				g_pWEBM->DestroyVideoMaterial( m_pWEBMMaterial );
-				m_nMaterialType = MATERIAL_INVALID;
-			}
+			g_pWEBM->DestroyVideoMaterial( m_pWEBMMaterial );
+			m_nMaterialType = MATERIAL_INVALID;
 		}
 		break;
 	case MATERIAL_BIK:

src/game/client/videoservices/video_material.cpp

@@ -313,9 +313,6 @@ void CVideoMaterial::CreateVideoMaterial( const char* pMaterialName )
 	m_textureWidth = ALIGN_VALUE(m_videoWidth, 8);
 	m_textureHeight = ALIGN_VALUE(m_videoHeight, 8);
 
-	//Warning("\nm_textureWidth: %d\nm_textureHeight: %d\nm_videoWidth: %d\nm_videoHeight: %d\n", m_textureWidth, m_textureHeight, m_videoWidth, m_videoHeight);
-
-
 	// create the textures
 	m_yTexture.InitProceduralTexture( ytexture, "VideoCacheTextures", m_textureWidth, m_textureHeight, IMAGE_FORMAT_I8, tex_flags );
 	// CB and CR are half the size of the Y (the brightness)
@@ -329,31 +326,6 @@ void CVideoMaterial::CreateVideoMaterial( const char* pMaterialName )
 	m_crTexture->SetTextureRegenerator( m_crTextureRegen );
 	m_cbTexture->SetTextureRegenerator( m_cbTextureRegen );
 
-
-	// ---------------------------
-	// material
-	// 
-	// Use the Bik shader as it deals with YUV420
-	KeyValues* pVMTKeyValues = new KeyValues( "Bik" );
-	pVMTKeyValues->SetString( "$ytexture", ytexture );
-	pVMTKeyValues->SetString( "$cbtexture", cbtexture );
-	pVMTKeyValues->SetString( "$crtexture", crtexture );
-	pVMTKeyValues->SetInt( "$nofog", 1 );
-	pVMTKeyValues->SetInt( "$spriteorientation", 3 );
-	pVMTKeyValues->SetInt( "$translucent", 1 );
-	pVMTKeyValues->SetInt( "$nolod", 1 );
-	pVMTKeyValues->SetInt( "$vertexcolor", 1 );
-	pVMTKeyValues->SetInt( "$vertexalpha", 1 );
-	pVMTKeyValues->SetInt( "$nomip", 1 );
-	m_videoMaterial.Init( pMaterialName, pVMTKeyValues );
-
-	// Refresh the material vars because apparently init doesn't do this
-	// and retains the previous video's frame
-	m_videoMaterial->Refresh();
-
-	m_videoReady = true;
-	m_videoStarted = false;
-
 	// update the procedural texture with the first frame of the video
 	WebMFrame video_frame;
 	VPXDecoder::Image image;
@@ -376,8 +348,29 @@ void CVideoMaterial::CreateVideoMaterial( const char* pMaterialName )
 			break;
 		}
 	}
-
 	m_demuxer->resetVideo();
+
+	// ---------------------------
+	// material
+	// Use the Bik shader as it deals with YUV420
+	KeyValues* pVMTKeyValues = new KeyValues( "Bik" );
+	pVMTKeyValues->SetString( "$ytexture", ytexture );
+	pVMTKeyValues->SetString( "$cbtexture", cbtexture );
+	pVMTKeyValues->SetString( "$crtexture", crtexture );
+	pVMTKeyValues->SetInt( "$nofog", 1 );
+	pVMTKeyValues->SetInt( "$spriteorientation", 3 );
+	pVMTKeyValues->SetInt( "$translucent", 1 );
+	pVMTKeyValues->SetInt( "$nolod", 1 );
+	pVMTKeyValues->SetInt( "$vertexcolor", 1 );
+	pVMTKeyValues->SetInt( "$vertexalpha", 1 );
+	pVMTKeyValues->SetInt( "$nomip", 1 );
+	m_videoMaterial.Init( pMaterialName, pVMTKeyValues );
+	// Refresh the material vars because apparently init doesn't do this
+	// and retains the previous video's frame
+	m_videoMaterial->Refresh();
+
+	m_videoReady = true;
+	m_videoStarted = false;
 }
 
 const char *CVideoMaterial::GetVideoFileName()