client almost builds

src/EffectLib/CMakeLists.txt

@@ -2,7 +2,8 @@
 
 add_library(EffectLib STATIC ${FILE_SOURCES})
 
-# target_link_libraries(EffectLib 
-# )
+target_link_libraries(EffectLib 
+	lzo2
+)
 
 GroupSourcesByFolder(EffectLib)

src/EffectLib/EffectData.cpp

@@ -96,11 +96,11 @@ bool CEffectData::LoadScript(const char * c_szFileName)
 
 bool CEffectData::LoadSoundScriptData(const char * c_szFileName)
 {
-	NSound::TSoundDataVector SoundDataVector;
+	TSoundDataVector SoundDataVector;
 
-	if (NSound::LoadSoundInformationPiece(c_szFileName, SoundDataVector))
+	if (LoadSoundInformationPiece(c_szFileName, SoundDataVector))
 	{
-		NSound::DataToInstance(SoundDataVector, &m_SoundInstanceVector);
+		DataToInstance(SoundDataVector, &m_SoundInstanceVector);
 		return false;
 	}
 
@@ -164,7 +164,7 @@ CEffectMeshScript * CEffectData::GetMeshPointer(DWORD dwPosition)
 	return m_MeshVector[dwPosition];
 }
 
-NSound::TSoundInstanceVector * CEffectData::GetSoundInstanceVector()
+TSoundInstanceVector * CEffectData::GetSoundInstanceVector()
 {
 	return &m_SoundInstanceVector;
 }

src/EffectLib/EffectData.h

@@ -30,7 +30,7 @@ class CEffectData
 		DWORD							GetLightCount();
 		CLightData *					GetLightPointer(DWORD dwPosition);
 
-		NSound::TSoundInstanceVector *	GetSoundInstanceVector();
+		TSoundInstanceVector *			GetSoundInstanceVector();
 
 		float							GetBoundingSphereRadius();
 		D3DXVECTOR3						GetBoundingSpherePosition();
@@ -52,7 +52,7 @@ class CEffectData
 		TParticleVector					m_ParticleVector;
 		TMeshVector						m_MeshVector;
 		TLightVector					m_LightVector;
-		NSound::TSoundInstanceVector	m_SoundInstanceVector;
+		TSoundInstanceVector			m_SoundInstanceVector;
 
 		float							m_fBoundingSphereRadius;
 		D3DXVECTOR3						m_v3BoundingSpherePosition;

src/EffectLib/EffectInstance.cpp

@@ -50,8 +50,12 @@ void CEffectInstance::UpdateSound()
 {
 	if (m_pSoundInstanceVector)
 	{
-		CSoundManager& rkSndMgr=CSoundManager::Instance();
-		rkSndMgr.UpdateSoundInstance(m_matGlobal._41, m_matGlobal._42, m_matGlobal._43, m_dwFrame, m_pSoundInstanceVector);
+		UpdateSoundInstance(m_dwFrame,
+			*m_pSoundInstanceVector,
+			m_matGlobal._41,
+			m_matGlobal._42,
+			m_matGlobal._43,
+			false);
 		// NOTE : 매트릭스에서 위치를 직접 얻어온다 - [levites]
 	}
 	++m_dwFrame;

src/EffectLib/EffectInstance.h

@@ -77,7 +77,7 @@ class CEffectInstance : public CGraphicObjectInstance
 		std::vector<CEffectMeshInstance*>		m_MeshInstanceVector;
 		std::vector<CLightInstance*>			m_LightInstanceVector;
 
-		NSound::TSoundInstanceVector *	m_pSoundInstanceVector;
+		TSoundInstanceVector *					m_pSoundInstanceVector;
 
 		float m_fBoundingSphereRadius;
 		D3DXVECTOR3 m_v3BoundingSpherePosition;

src/EffectLib/ParticleSystemInstance.cpp

@@ -47,7 +47,7 @@ void CParticleSystemInstance::CreateParticles(float fElapsedTime)
 	int icurEmissionCount = GetEmissionCount();
 	int iMaxEmissionCount = int(m_pEmitterProperty->GetMaxEmissionCount());
 	int iNextEmissionCount = int(icurEmissionCount + iCreatingCount);
-	iCreatingCount -= max(0, iNextEmissionCount - iMaxEmissionCount);
+	iCreatingCount -= std::max(0, iNextEmissionCount - iMaxEmissionCount);
 
 	float fLifeTime = 0.0f;
 	float fEmittingSize = 0.0f;