summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-07-04 14:24:54 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2021-07-04 14:24:54 +0200
commit62425b586631f95d67f2c9ba8c9a4f202e03bda4 (patch)
tree418a28a718cfe01cc0b8a224e0c1bab6a75de26a /src/core
parentMerge remote-tracking branch 'upstream/lcs' into lcs (diff)
parentMerge branch 'miami' into lcs (diff)
downloadre3-62425b586631f95d67f2c9ba8c9a4f202e03bda4.tar
re3-62425b586631f95d67f2c9ba8c9a4f202e03bda4.tar.gz
re3-62425b586631f95d67f2c9ba8c9a4f202e03bda4.tar.bz2
re3-62425b586631f95d67f2c9ba8c9a4f202e03bda4.tar.lz
re3-62425b586631f95d67f2c9ba8c9a4f202e03bda4.tar.xz
re3-62425b586631f95d67f2c9ba8c9a4f202e03bda4.tar.zst
re3-62425b586631f95d67f2c9ba8c9a4f202e03bda4.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Crime.h2
-rw-r--r--src/core/MenuScreensCustom.cpp5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/core/Crime.h b/src/core/Crime.h
index 3c3e2b26..4c7ea315 100644
--- a/src/core/Crime.h
+++ b/src/core/Crime.h
@@ -28,7 +28,7 @@ class CCrimeBeingQd
{
public:
eCrimeType m_nType;
- uint32 m_nId;
+ int32 m_nId;
uint32 m_nTime;
CVector m_vecPosn;
bool m_bReported;
diff --git a/src/core/MenuScreensCustom.cpp b/src/core/MenuScreensCustom.cpp
index 0534e34a..49bb33f8 100644
--- a/src/core/MenuScreensCustom.cpp
+++ b/src/core/MenuScreensCustom.cpp
@@ -26,6 +26,7 @@
#include "ModelInfo.h"
#include "Pad.h"
#include "ControllerConfig.h"
+#include "DMAudio.h"
// Menu screens array is at the bottom of the file.
@@ -194,6 +195,8 @@ void MultiSamplingButtonPress(int8 action) {
if (FrontEndMenuManager.m_nDisplayMSAALevel != FrontEndMenuManager.m_nPrefsMSAALevel) {
FrontEndMenuManager.m_nPrefsMSAALevel = FrontEndMenuManager.m_nDisplayMSAALevel;
_psSelectScreenVM(FrontEndMenuManager.m_nPrefsVideoMode);
+ DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
+ DMAudio.Service();
FrontEndMenuManager.SetHelperText(0);
FrontEndMenuManager.SaveSettings();
}
@@ -255,6 +258,8 @@ const char* screenModes[] = { "FED_FLS", "FED_WND" };
void ScreenModeAfterChange(int8 before, int8 after)
{
_psSelectScreenVM(FrontEndMenuManager.m_nPrefsVideoMode); // apply same resolution
+ DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
+ DMAudio.Service();
FrontEndMenuManager.SetHelperText(0);
}