************************************************************

* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-01-18 09:11:09 +00:00
parent 44e1646410
commit 91087ca8c0
469 changed files with 118108 additions and 24678 deletions
+10 -7
View File
@@ -21,6 +21,7 @@
#include "random.h"
#include "fmod.h"
#include "fmod_errors.h"
#include "sgp_logger.h"
#endif
// Uncomment this to disable the startup of sound hardware
@@ -1801,14 +1802,16 @@ UINT32 uiCount;
return(FALSE);
}
#include "VFS/vfs.h"
#include "VFS/Tools/Log.h"
// Lesh modifications
// Sound debug
#ifdef USE_VFS
static CLog& s_SoundLog = *CLog::create(SndDebugFileName,true);
#endif
static struct SoundLog {
sgp::Logger_ID id;
SoundLog() {
id = sgp::Logger::instance().createLogger();
sgp::Logger::instance().connectFile(id, SndDebugFileName, true, sgp::Logger::FLUSH_ON_DELETE);
}
} s_SoundLog;
//*****************************************************************************************
// SoundLog
// Writes string into log file
@@ -1826,7 +1829,7 @@ void SoundLog(CHAR8 *strMessage)
fclose(SndDebug);
}
#else
s_SoundLog << strMessage << CLog::ENDL;
SGP_LOG(s_SoundLog.id, vfs::String::widen(strMessage,strlen(strMessage)));
#endif
}