diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-24 00:07:03 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-24 00:07:03 +0200 |
| commit | 0c4ce002f1e076f278fde12673ef8f973952b785 (patch) | |
| tree | a0a0f735277f21cfafc1cc4d9f990e340d473009 | |
| parent | Cleanup (diff) | |
| parent | Fix OAL crash (diff) | |
| download | re3-0c4ce002f1e076f278fde12673ef8f973952b785.tar re3-0c4ce002f1e076f278fde12673ef8f973952b785.tar.gz re3-0c4ce002f1e076f278fde12673ef8f973952b785.tar.bz2 re3-0c4ce002f1e076f278fde12673ef8f973952b785.tar.lz re3-0c4ce002f1e076f278fde12673ef8f973952b785.tar.xz re3-0c4ce002f1e076f278fde12673ef8f973952b785.tar.zst re3-0c4ce002f1e076f278fde12673ef8f973952b785.zip | |
| -rw-r--r-- | premake5.lua | 2 | ||||
| -rw-r--r-- | src/audio/oal/aldlist.cpp | 3 | ||||
| -rw-r--r-- | src/audio/oal/aldlist.h | 11 | ||||
| -rw-r--r-- | src/audio/sampman.h | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/premake5.lua b/premake5.lua index 036dad09..e91281e6 100644 --- a/premake5.lua +++ b/premake5.lua @@ -190,8 +190,6 @@ project "re3" includedirs { "src/weapons" } includedirs { "src/extras" } includedirs { "eax" } - - includedirs { "eax" } if _OPTIONS["with-opus"] then includedirs { "ogg/include" } diff --git a/src/audio/oal/aldlist.cpp b/src/audio/oal/aldlist.cpp index 7401e036..9834ffb4 100644 --- a/src/audio/oal/aldlist.cpp +++ b/src/audio/oal/aldlist.cpp @@ -35,7 +35,6 @@ */ ALDeviceList::ALDeviceList() { - ALDEVICEINFO ALDeviceInfo; char *devices; int index; const char *defaultDeviceName; @@ -71,7 +70,7 @@ ALDeviceList::ALDeviceList() } } if ((bNewName) && (actualDeviceName != NULL) && (strlen(actualDeviceName) > 0)) { - memset(&ALDeviceInfo, 0, sizeof(ALDEVICEINFO)); + ALDEVICEINFO ALDeviceInfo; ALDeviceInfo.bSelected = true; ALDeviceInfo.strDeviceName = actualDeviceName; alcGetIntegerv(device, ALC_MAJOR_VERSION, sizeof(int), &ALDeviceInfo.iMajorVersion); diff --git a/src/audio/oal/aldlist.h b/src/audio/oal/aldlist.h index 694c9d01..3afa6bfe 100644 --- a/src/audio/oal/aldlist.h +++ b/src/audio/oal/aldlist.h @@ -8,15 +8,20 @@ #include <vector> #include <string> -typedef struct -{ +struct ALDEVICEINFO { std::string strDeviceName; int iMajorVersion; int iMinorVersion; unsigned int uiSourceCount; std::vector<std::string> *pvstrExtensions; bool bSelected; -} ALDEVICEINFO, *LPALDEVICEINFO; + + ALDEVICEINFO() : iMajorVersion(0), iMinorVersion(0), uiSourceCount(0), pvstrExtensions(NULL), bSelected(false) + { + } +}; + +typedef ALDEVICEINFO *LPALDEVICEINFO; class ALDeviceList { diff --git a/src/audio/sampman.h b/src/audio/sampman.h index 3eeff476..14b01bc0 100644 --- a/src/audio/sampman.h +++ b/src/audio/sampman.h @@ -3,7 +3,7 @@ #include "AudioSamples.h" #define MAX_VOLUME 127 -#define MAX_FREQ 22050 +#define MAX_FREQ DIGITALRATE struct tSample { int32 nOffset; |