mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
LIMIT_SIMULTANEOUS_SOUND option: changed delay to 50ms.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9380 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -28,6 +28,7 @@
|
|||||||
//#include "english.h"
|
//#include "english.h"
|
||||||
//#include "input.h"
|
//#include "input.h"
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
|
#include <chrono>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Uncomment this to disable the startup of sound hardware
|
// Uncomment this to disable the startup of sound hardware
|
||||||
@@ -291,7 +292,13 @@ void ShutdownSoundManager(void)
|
|||||||
//
|
//
|
||||||
//*******************************************************************************
|
//*******************************************************************************
|
||||||
|
|
||||||
std::map<std::string, std::time_t, std::less<>> gSoundMap;
|
std::map<std::string, uint64_t, std::less<>> gSoundMap;
|
||||||
|
|
||||||
|
uint64_t TimeMS()
|
||||||
|
{
|
||||||
|
using namespace std::chrono;
|
||||||
|
return duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();
|
||||||
|
}
|
||||||
|
|
||||||
UINT32 SoundPlay(STR pFilename, SOUNDPARMS *pParms)
|
UINT32 SoundPlay(STR pFilename, SOUNDPARMS *pParms)
|
||||||
{
|
{
|
||||||
@@ -305,7 +312,7 @@ UINT32 SoundPlay(STR pFilename, SOUNDPARMS *pParms)
|
|||||||
if (gGameExternalOptions.fLimitSimultaneousSound)
|
if (gGameExternalOptions.fLimitSimultaneousSound)
|
||||||
//!_KeyDown(SHIFT))
|
//!_KeyDown(SHIFT))
|
||||||
{
|
{
|
||||||
std::time_t curtime = std::time(0);
|
uint64_t curtime = TimeMS();
|
||||||
std::string filename(pFilename);
|
std::string filename(pFilename);
|
||||||
|
|
||||||
if (gSoundMap[filename] > curtime)
|
if (gSoundMap[filename] > curtime)
|
||||||
@@ -314,7 +321,7 @@ UINT32 SoundPlay(STR pFilename, SOUNDPARMS *pParms)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// set delay for this sound type
|
// set delay for this sound type
|
||||||
gSoundMap[filename] = curtime + 1;
|
gSoundMap[filename] = curtime + 50;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((uiSample = SoundLoadSample(pFilename)) != NO_SAMPLE)
|
if ((uiSample = SoundLoadSample(pFilename)) != NO_SAMPLE)
|
||||||
|
|||||||
Reference in New Issue
Block a user