endtakes now work properly if used with --nosubtitles
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@973 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
@@ -20,6 +20,7 @@
|
|||||||
#include "libs/graphics/gfx_common.h"
|
#include "libs/graphics/gfx_common.h"
|
||||||
#include "libs/sound/sound_common.h"
|
#include "libs/sound/sound_common.h"
|
||||||
#include "oscill.h"
|
#include "oscill.h"
|
||||||
|
#include "options.h"
|
||||||
|
|
||||||
//Added by Chris
|
//Added by Chris
|
||||||
|
|
||||||
@@ -122,8 +123,10 @@ OutTakes (void)
|
|||||||
{
|
{
|
||||||
RECT r;
|
RECT r;
|
||||||
float oldvolume = speechVolumeScale;
|
float oldvolume = speechVolumeScale;
|
||||||
|
BOOLEAN oldsubtitles = optSubtitles;
|
||||||
|
|
||||||
speechVolumeScale = 0.0f;
|
speechVolumeScale = 0.0f;
|
||||||
|
optSubtitles = TRUE;
|
||||||
sliderDisabled = TRUE;
|
sliderDisabled = TRUE;
|
||||||
|
|
||||||
SetSemaphore (GraphicsSem);
|
SetSemaphore (GraphicsSem);
|
||||||
@@ -152,5 +155,6 @@ OutTakes (void)
|
|||||||
InitCommunication (ARILOU_CONVERSATION);
|
InitCommunication (ARILOU_CONVERSATION);
|
||||||
|
|
||||||
speechVolumeScale = oldvolume;
|
speechVolumeScale = oldvolume;
|
||||||
|
optSubtitles = oldsubtitles;
|
||||||
sliderDisabled = FALSE;
|
sliderDisabled = FALSE;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user