mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-17 18:59:09 +00:00
Fix some *nix compiler errors.
This commit is contained in:
@ -44,6 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#define _HS_ALIGNED_ALLOCATOR_H
|
||||
|
||||
#include "HeadSpin.h"
|
||||
#include <stdexcept>
|
||||
|
||||
template<class T, size_t ALIGNMENT=16>
|
||||
|
||||
@ -56,10 +57,10 @@ class hsAlignedAllocator
|
||||
hsAlignedAllocator& operator=(const hsAlignedAllocator&) { }
|
||||
|
||||
public:
|
||||
template <typename U, size_t ALIGNMENT=16>
|
||||
template <typename U, size_t ALIGN=16>
|
||||
struct rebind
|
||||
{
|
||||
typedef hsAlignedAllocator<U, ALIGNMENT> other;
|
||||
typedef hsAlignedAllocator<U, ALIGN> other;
|
||||
};
|
||||
|
||||
typedef T* pointer;
|
||||
|
@ -212,7 +212,7 @@ bool plWin32GroupedSound::LoadSound( bool is3D )
|
||||
if( !fDSoundBuffer->IsValid() )
|
||||
{
|
||||
char str[256];
|
||||
sprintf(str, "Can't create sound buffer for %s.wav. This could happen if the wav file is a stereo file. Stereo files are not supported on 3D sounds. If the file is not stereo then please report this error.", GetFileName());
|
||||
sprintf(str, "Can't create sound buffer for %s.wav. This could happen if the wav file is a stereo file. Stereo files are not supported on 3D sounds. If the file is not stereo then please report this error.", GetFileName().AsString().c_str());
|
||||
IPrintDbgMessage( str, true );
|
||||
fFailed = true;
|
||||
|
||||
|
@ -153,7 +153,7 @@ bool plWin32StaticSound::LoadSound( bool is3D )
|
||||
if( !fDSoundBuffer->IsValid() )
|
||||
{
|
||||
char str[256];
|
||||
sprintf(str, "Can't create sound buffer for %s.wav. This could happen if the wav file is a stereo file. Stereo files are not supported on 3D sounds. If the file is not stereo then please report this error.", GetFileName());
|
||||
sprintf(str, "Can't create sound buffer for %s.wav. This could happen if the wav file is a stereo file. Stereo files are not supported on 3D sounds. If the file is not stereo then please report this error.", GetFileName().AsString().c_str());
|
||||
IPrintDbgMessage( str, true );
|
||||
fFailed = true;
|
||||
|
||||
|
Reference in New Issue
Block a user