mirror of
https://github.com/libretro/scummvm.git
synced 2025-04-03 23:31:57 +00:00
SAGA2: Replace custom config code with ScummVM
This commit is contained in:
Eugene Sandulenko
parent
f4203b3d27
commit
4a71417f5c
@ -29,7 +29,6 @@
|
||||
#include "saga2/std.h"
|
||||
#include "saga2/calender.h"
|
||||
#include "saga2/intrface.h"
|
||||
#include "saga2/config.h"
|
||||
#include "saga2/localize.h"
|
||||
#include "saga2/savefile.h"
|
||||
|
||||
@ -43,8 +42,6 @@ static bool calenderPaused;
|
||||
|
||||
const int dayBias = CalenderTime::framesAtNoon / 6;
|
||||
|
||||
extern configuration globalConfig;
|
||||
|
||||
/* ===================================================================== *
|
||||
Constants
|
||||
* ===================================================================== */
|
||||
@ -129,7 +126,7 @@ int CalenderTime::lightLevel(int maxLevel) {
|
||||
// to framesAtNoon*2/3. Then we clip off the part of the
|
||||
// curve below zero, and above 1/3, giving 1/3 night,
|
||||
// 1/6 morning, 1/3 day, and 1/6 evening.
|
||||
solarLevel = clamp(globalConfig.showNight ? /* 0 */ (dayBias * 5 / 4) : (framesAtNoon / 3),
|
||||
solarLevel = clamp(g_vm->_showNight ? /* 0 */ (dayBias * 5 / 4) : (framesAtNoon / 3),
|
||||
solarAngle * 2 + season - framesAtNoon / 3 + dayBias * 2,
|
||||
framesAtNoon / 3);
|
||||
|
||||
|
||||
@ -1,121 +0,0 @@
|
||||
/* ScummVM - Graphic Adventure Engine
|
||||
*
|
||||
* ScummVM is the legal property of its developers, whose names
|
||||
* are too numerous to list here. Please refer to the COPYRIGHT
|
||||
* file distributed with this source distribution.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
*
|
||||
* Based on the original sources
|
||||
* Faery Tale II -- The Halls of the Dead
|
||||
* (c) 1993-1996 The Wyrmkeep Entertainment Co.
|
||||
*/
|
||||
|
||||
#include "saga2/std.h"
|
||||
#include "saga2/config.h"
|
||||
|
||||
namespace Saga2 {
|
||||
|
||||
char iniFile[] = "FTA2.INI";
|
||||
configuration globalConfig;
|
||||
|
||||
static char originalDir[PATH_STR_SIZE];
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
// This doesn't belong here, oh well...
|
||||
|
||||
inline bool file_exists(const char f[]) {
|
||||
warning("STUB: file_exists()");
|
||||
return false;
|
||||
//return (!access(f, F_OK));
|
||||
}
|
||||
inline void deletefile(char n[]) {
|
||||
if (file_exists(n)) remove(n);
|
||||
}
|
||||
|
||||
void KillLogs(void) {
|
||||
deletefile("AUDIOERR.LOG");
|
||||
deletefile("SYSERRS.LOG");
|
||||
deletefile("ERRORS.LOG");
|
||||
deletefile("MEMDUMP.LOG");
|
||||
deletefile("WINERROR.LOG");
|
||||
deletefile("MEMORY.LOG");
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
// Sets default values in config file
|
||||
|
||||
static void defaultConfig(configuration &config) {
|
||||
config.musicVolume = 127;
|
||||
config.soundVolume = 127;
|
||||
config.voiceVolume = 127;
|
||||
config.autoAggression = true;
|
||||
config.autoWeapon = true;
|
||||
config.speechText = true;
|
||||
config.showNight = true;
|
||||
#ifdef _WIN32
|
||||
config.windowed = false;
|
||||
#endif
|
||||
strcpy(config.soundResfilePath, ".\\");
|
||||
strcpy(config.voiceResfilePath, ".\\");
|
||||
strcpy(config.imageResfilePath, ".\\");
|
||||
strcpy(config.videoFilePath, ".\\");
|
||||
strcpy(config.mainResfilePath, ".\\");
|
||||
strcpy(config.dataResfilePath, ".\\");
|
||||
strcpy(config.scriptResfilePath, ".\\");
|
||||
strcpy(config.savedGamePath, ".\\");
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
// saves settings to INI file
|
||||
|
||||
void writeConfig(void) {
|
||||
#if 0
|
||||
WritePrivateProfileInt("Sound", "MusicVolume", globalConfig.musicVolume, iniFile);
|
||||
WritePrivateProfileInt("Sound", "SoundVolume", globalConfig.soundVolume, iniFile);
|
||||
WritePrivateProfileInt("Sound", "VoiceVolume", globalConfig.voiceVolume, iniFile);
|
||||
WritePrivateProfileInt("Options", "AutoAggression", globalConfig.autoAggression, iniFile);
|
||||
WritePrivateProfileInt("Options", "AutoWeapon", globalConfig.autoWeapon, iniFile);
|
||||
WritePrivateProfileInt("Options", "SpeechText", globalConfig.speechText, iniFile);
|
||||
WritePrivateProfileInt("Options", "Night", globalConfig.showNight, iniFile);
|
||||
#endif
|
||||
warning("STUB: writeConfig()");
|
||||
}
|
||||
|
||||
/* ===================================================================== *
|
||||
Functions to save the original program directory, and to return to
|
||||
that directory whenever needed.
|
||||
* ===================================================================== */
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
// Determine's the programs home directory
|
||||
|
||||
|
||||
void findProgramDir(char *argv) {
|
||||
char *sep;
|
||||
sprintf(originalDir, "%s", argv);
|
||||
if ((sep = strrchr(originalDir, '\\')) != NULL) * sep = '\0';
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
// Does a CD back to the program's directory
|
||||
|
||||
void restoreProgramDir(void) {
|
||||
warning("STUB: restoreProgramDir()");
|
||||
//chdir(originalDir);
|
||||
}
|
||||
|
||||
} // end of namespace Saga2
|
||||
@ -1,72 +0,0 @@
|
||||
/* ScummVM - Graphic Adventure Engine
|
||||
*
|
||||
* ScummVM is the legal property of its developers, whose names
|
||||
* are too numerous to list here. Please refer to the COPYRIGHT
|
||||
* file distributed with this source distribution.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
*
|
||||
* Based on the original sources
|
||||
* Faery Tale II -- The Halls of the Dead
|
||||
* (c) 1993-1996 The Wyrmkeep Entertainment Co.
|
||||
*/
|
||||
|
||||
#ifndef SAGA2_CONFIG_H
|
||||
#define SAGA2_CONFIG_H
|
||||
|
||||
namespace Saga2 {
|
||||
|
||||
// under WIN95 paths can get BIG
|
||||
#define PATH_STR_SIZE 260
|
||||
|
||||
/* ===================================================================== *
|
||||
FTA2 INI file settings
|
||||
* ===================================================================== */
|
||||
|
||||
struct configuration {
|
||||
uint8 musicVolume;
|
||||
uint8 soundVolume;
|
||||
uint8 voiceVolume;
|
||||
bool autoAggression;
|
||||
bool autoWeapon;
|
||||
bool speechText;
|
||||
bool showNight;
|
||||
#ifdef _WIN32
|
||||
bool windowed;
|
||||
#endif
|
||||
char soundResfilePath[PATH_STR_SIZE];
|
||||
char voiceResfilePath[PATH_STR_SIZE];
|
||||
char imageResfilePath[PATH_STR_SIZE];
|
||||
char videoFilePath[PATH_STR_SIZE];
|
||||
char mainResfilePath[PATH_STR_SIZE];
|
||||
char dataResfilePath[PATH_STR_SIZE];
|
||||
char scriptResfilePath[PATH_STR_SIZE];
|
||||
char savedGamePath[PATH_STR_SIZE];
|
||||
};
|
||||
|
||||
/* ===================================================================== *
|
||||
FTA2 INI file code
|
||||
* ===================================================================== */
|
||||
|
||||
void writeConfig(void);
|
||||
void findProgramDir(char *argv);
|
||||
void restoreProgramDir(void);
|
||||
|
||||
extern configuration globalConfig;
|
||||
|
||||
} // end of namespace Saga2
|
||||
|
||||
#endif // CONFIG_H
|
||||
@ -46,7 +46,6 @@
|
||||
#include "saga2/loadsave.h"
|
||||
#include "saga2/gamerate.h"
|
||||
#include "saga2/msgbox.h"
|
||||
#include "saga2/config.h"
|
||||
#include "saga2/savefile.h"
|
||||
|
||||
namespace Saga2 {
|
||||
@ -60,7 +59,6 @@ namespace Saga2 {
|
||||
|
||||
extern WindowDecoration autoMapDecorations[];
|
||||
extern gToolBase G_BASE;
|
||||
extern configuration globalConfig;
|
||||
extern char *gameTimeStr;
|
||||
extern bool underground;
|
||||
extern char commandLineHelp[];
|
||||
@ -573,7 +571,6 @@ inline char drive(char *path) {
|
||||
|
||||
static bool openResource(
|
||||
pHResource &hr, // resource to initialize
|
||||
const char *basePath, // path to data file
|
||||
const char *defaultPath, // backup path
|
||||
const char *fileName, // file name & extension
|
||||
const char *description) {
|
||||
@ -601,26 +598,20 @@ static bool openResource(
|
||||
bool openResources(void) {
|
||||
|
||||
if (
|
||||
openResource(resFile, globalConfig.imageResfilePath,
|
||||
"..\\resfile\\", IMAGE_RESFILE,
|
||||
openResource(resFile, "..\\resfile\\", IMAGE_RESFILE,
|
||||
"Imagery resource file") &&
|
||||
|
||||
openResource(objResFile, globalConfig.mainResfilePath,
|
||||
"..\\resfile\\", OBJECT_RESFILE,
|
||||
openResource(objResFile, "..\\resfile\\", OBJECT_RESFILE,
|
||||
"Object resource file") &&
|
||||
|
||||
openResource(auxResFile, globalConfig.dataResfilePath,
|
||||
"..\\resfile\\", AUX_RESFILE,
|
||||
openResource(auxResFile, "..\\resfile\\", AUX_RESFILE,
|
||||
"Data resource file") &&
|
||||
|
||||
openResource(scriptResFile, globalConfig.scriptResfilePath,
|
||||
"..\\scripts\\", SCRIPT_RESFILE,
|
||||
openResource(scriptResFile, "..\\scripts\\", SCRIPT_RESFILE,
|
||||
"Script resource file") &&
|
||||
openResource(voiceResFile, globalConfig.voiceResfilePath,
|
||||
"..\\sound\\", VOICE_RESFILE,
|
||||
openResource(voiceResFile, "..\\sound\\", VOICE_RESFILE,
|
||||
"Voice resource file") &&
|
||||
openResource(soundResFile, globalConfig.soundResfilePath,
|
||||
"..\\sound\\", SOUND_RESFILE,
|
||||
openResource(soundResFile, "..\\sound\\", SOUND_RESFILE,
|
||||
"Sound resource file")) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -13,7 +13,6 @@ MODULE_OBJS := \
|
||||
blitters.o \
|
||||
button.o \
|
||||
calender.o \
|
||||
config.o \
|
||||
contain.o \
|
||||
detection.o \
|
||||
display.o \
|
||||
|
||||
@ -24,6 +24,8 @@
|
||||
* (c) 1993-1996 The Wyrmkeep Entertainment Co.
|
||||
*/
|
||||
|
||||
#include "common/config-manager.h"
|
||||
|
||||
#include "saga2/std.h"
|
||||
#include "saga2/fta.h"
|
||||
#include "saga2/audio.h"
|
||||
@ -36,7 +38,6 @@
|
||||
#include "saga2/audiosmp.h"
|
||||
#include "saga2/audqueue.h"
|
||||
#include "saga2/audiosys.h"
|
||||
#include "saga2/config.h"
|
||||
#include "saga2/hresmgr.h"
|
||||
|
||||
namespace Saga2 {
|
||||
@ -63,8 +64,6 @@ const uint32 baseMusicID = MKTAG('M', 'I', 'L', 'O'),
|
||||
extern audioInterface *audio;
|
||||
extern hResource *soundResFile; // script resources
|
||||
extern hResource *voiceResFile; // script resources
|
||||
extern configuration globalConfig;
|
||||
extern char iniFile[];
|
||||
|
||||
extern int32 maxClicks;
|
||||
extern int32 clickSizes[];
|
||||
@ -234,18 +233,10 @@ void startAudio(void) {
|
||||
(uint32) 400000 // sound buffer size
|
||||
);
|
||||
|
||||
bool disVoice = false, disMusic= false, disSound= false, disLoops= false;
|
||||
warning("STUB: startAudio, sync sound settings");
|
||||
#if 0
|
||||
|
||||
disMusic = !GetPrivateProfileInt("Sound", "Music", 1, iniFile);
|
||||
disVoice = !GetPrivateProfileInt("Sound", "Voice", 1, iniFile);
|
||||
disLoops = !GetPrivateProfileInt("Sound", "Loops", 1, iniFile);
|
||||
disSound = !GetPrivateProfileInt("Sound", "Sound", 1, iniFile);
|
||||
#endif
|
||||
|
||||
return;
|
||||
|
||||
bool disVoice = true, disMusic = true, disSound = true, disLoops = true;
|
||||
|
||||
if (audio->active()) {
|
||||
voiceDec = new decoderSet();
|
||||
voiceDec->addDecoder(new soundDecoder(&readVoice, &seekVoice, &flushVoice));
|
||||
@ -268,6 +259,11 @@ void startAudio(void) {
|
||||
|
||||
uint32 musicID = haveKillerSoundCard() ? goodMusicID : baseMusicID;
|
||||
|
||||
disVoice = !ConfMan.getInt("speech_volume");
|
||||
disMusic = !ConfMan.getInt("music_volume");
|
||||
disSound = !ConfMan.getInt("sfx_volume");
|
||||
disLoops = disSound;
|
||||
|
||||
if (!disMusic) {
|
||||
musicRes = soundResFile->newContext(musicID, "music resource");
|
||||
if (musicRes == NULL)
|
||||
@ -302,11 +298,6 @@ void startAudio(void) {
|
||||
//audio->setMusicFadeStyle(15,15,5);
|
||||
audio->setMusicFadeStyle(0, 0, 0);
|
||||
oldAttenuator = audio->setAttenuator(&volumeFromDist);
|
||||
|
||||
audio->setVolume(volMusic, volumeSetTo, globalConfig.musicVolume);
|
||||
audio->setVolume(volVoice, volumeSetTo, globalConfig.voiceVolume);
|
||||
audio->setVolume(volSandL, volumeSetTo, globalConfig.soundVolume);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -79,11 +79,7 @@ Common::Error Saga2Engine::run() {
|
||||
// Initialize graphics using following:
|
||||
initGraphics(640, 480);
|
||||
|
||||
// Additional setup.
|
||||
debug("Saga2Engine::init");
|
||||
|
||||
// Your main even loop should be (invoked from) here.
|
||||
debug("Saga2Engine::go: Hello, World!");
|
||||
readConfig();
|
||||
|
||||
loadExeResources();
|
||||
|
||||
@ -257,4 +253,32 @@ void Saga2Engine::freeExeResources() {
|
||||
freeCursors();
|
||||
}
|
||||
|
||||
void Saga2Engine::readConfig() {
|
||||
_autoWeapon = true;
|
||||
|
||||
if (ConfMan.hasKey("auto_weapon"))
|
||||
_autoWeapon = ConfMan.getBool("auto_weapon");
|
||||
|
||||
_autoAggression = true;
|
||||
|
||||
if (ConfMan.hasKey("auto_aggression"))
|
||||
_autoAggression = ConfMan.getBool("auto_aggression");
|
||||
|
||||
_showNight = true;
|
||||
|
||||
if (ConfMan.hasKey("show_night"))
|
||||
_showNight = ConfMan.getBool("show_night");
|
||||
|
||||
_speechText = true;
|
||||
|
||||
if (ConfMan.hasKey("subtitles"))
|
||||
_speechText = ConfMan.getBool("subtitles");
|
||||
|
||||
syncSoundSettings();
|
||||
}
|
||||
|
||||
void Saga2Engine::saveConfig() {
|
||||
ConfMan.flushToDisk();
|
||||
}
|
||||
|
||||
} // End of namespace Saga2
|
||||
|
||||
@ -76,6 +76,9 @@ public:
|
||||
void endVideo(void);
|
||||
void abortVideo(void);
|
||||
|
||||
void readConfig();
|
||||
void saveConfig();
|
||||
|
||||
public:
|
||||
// We need random numbers
|
||||
Common::RandomSource *_rnd;
|
||||
@ -85,6 +88,11 @@ public:
|
||||
Common::List<TimerList *> _timerLists;
|
||||
Common::List<Timer *> _timers;
|
||||
|
||||
bool _autoAggression;
|
||||
bool _autoWeapon;
|
||||
bool _showNight;
|
||||
bool _speechText;
|
||||
|
||||
private:
|
||||
Video::SmackerDecoder *_smkDecoder;
|
||||
int _videoX, _videoY;
|
||||
|
||||
@ -28,7 +28,6 @@
|
||||
|
||||
#include "saga2/std.h"
|
||||
#include "saga2/savefile.h"
|
||||
#include "saga2/config.h"
|
||||
|
||||
namespace Saga2 {
|
||||
|
||||
@ -41,7 +40,7 @@ namespace Saga2 {
|
||||
// number
|
||||
|
||||
void getSaveFileName(int16 saveNo, char *fileName) {
|
||||
sprintf(fileName, "%s%3.3d.SAV", globalConfig.savedGamePath, saveNo);
|
||||
sprintf(fileName, "%3.3d.SAV", saveNo);
|
||||
}
|
||||
|
||||
/* ===================================================================== *
|
||||
|
||||
@ -37,7 +37,6 @@
|
||||
#include "saga2/annoy.h"
|
||||
#include "saga2/savefile.h"
|
||||
#include "saga2/cmisc.h"
|
||||
#include "saga2/config.h"
|
||||
|
||||
namespace Saga2 {
|
||||
|
||||
@ -54,7 +53,6 @@ extern Point16 fineScroll;
|
||||
extern Rect16 tileRect;
|
||||
int kludgeHeight = 15;
|
||||
extern TilePoint viewCenter; // coordinates of view on map
|
||||
extern configuration globalConfig;
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
// constants
|
||||
@ -354,7 +352,7 @@ bool Speech::setupActive(void) {
|
||||
speechButtonCount,
|
||||
speechBuffer,
|
||||
bounds.width,
|
||||
!globalConfig.speechText && (speechFlags & spHasVoice));
|
||||
!g_vm->_speechText && (speechFlags & spHasVoice));
|
||||
|
||||
// Compute height of bitmap based on number of lines of text.
|
||||
// Include 4 for outline width
|
||||
@ -462,7 +460,7 @@ void Speech::setWidth() {
|
||||
speechButtonCount_,
|
||||
speechBuffer,
|
||||
defaultWidth,
|
||||
!globalConfig.speechText && (speechFlags & spHasVoice));
|
||||
!g_vm->_speechText && (speechFlags & spHasVoice));
|
||||
|
||||
// If it's more than 3 lines, then use the max line width.
|
||||
|
||||
@ -472,7 +470,7 @@ void Speech::setWidth() {
|
||||
speechButtonCount_,
|
||||
speechBuffer,
|
||||
maxWidth,
|
||||
!globalConfig.speechText && (speechFlags & spHasVoice));
|
||||
!g_vm->_speechText && (speechFlags & spHasVoice));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -42,7 +42,6 @@
|
||||
#include "saga2/intrface.h"
|
||||
#include "saga2/dispnode.h"
|
||||
#include "saga2/uidialog.h"
|
||||
#include "saga2/config.h"
|
||||
#include "saga2/contain.h"
|
||||
#include "saga2/savefile.h"
|
||||
|
||||
@ -98,7 +97,6 @@ extern hResContext *tileRes; // tile resource handle
|
||||
extern CycleHandle cycleList; // list of tile cycling info
|
||||
extern int16 cycleCount;
|
||||
extern int32 lastUpdateTime; // time of last display update
|
||||
extern configuration globalConfig;
|
||||
|
||||
//Prototypes For Tile Mode GameMode Object Init
|
||||
void TileModeHandleTask(void);
|
||||
@ -301,7 +299,9 @@ static void resumeCombat(void) {
|
||||
// This function performs all combat initialization tasks
|
||||
|
||||
static void startCombat(void) {
|
||||
if (globalConfig.autoAggression) autoAdjustAggression();
|
||||
if (g_vm->_autoAggression)
|
||||
autoAdjustAggression();
|
||||
|
||||
setCombatBehavior(true);
|
||||
combatPaused = false;
|
||||
}
|
||||
@ -322,27 +322,27 @@ static void endCombat(void) {
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
void toggleAutoAggression(void) {
|
||||
globalConfig.autoAggression = !globalConfig.autoAggression;
|
||||
updateAutoAggressionButton(globalConfig.autoAggression);
|
||||
g_vm->_autoAggression = !g_vm->_autoAggression;
|
||||
updateAutoAggressionButton(g_vm->_autoAggression);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
bool isAutoAggressionSet(void) {
|
||||
return globalConfig.autoAggression;
|
||||
return g_vm->_autoAggression;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
void toggleAutoWeapon(void) {
|
||||
globalConfig.autoWeapon = !globalConfig.autoWeapon;
|
||||
updateAutoWeaponButton(globalConfig.autoWeapon);
|
||||
g_vm->_autoWeapon = !g_vm->_autoWeapon;
|
||||
updateAutoWeaponButton(g_vm->_autoWeapon);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
bool isAutoWeaponSet(void) {
|
||||
return globalConfig.autoWeapon;
|
||||
return g_vm->_autoWeapon;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
@ -30,7 +30,6 @@
|
||||
#include "saga2/fta.h"
|
||||
#include "saga2/player.h"
|
||||
#include "saga2/display.h"
|
||||
#include "saga2/config.h"
|
||||
#include "saga2/panel.h"
|
||||
|
||||
namespace Saga2 {
|
||||
@ -56,7 +55,6 @@ extern bool gameRunning;
|
||||
extern gMouseState prevState;
|
||||
extern gMousePointer pointer;
|
||||
extern MouseExtState mouseQueue[];
|
||||
extern configuration globalConfig;
|
||||
extern bool allPlayerActorsDead;
|
||||
|
||||
extern int16 queueIn,
|
||||
|
||||
@ -26,6 +26,9 @@
|
||||
|
||||
#define FORBIDDEN_SYMBOL_ALLOW_ALL // FIXME: Remove
|
||||
|
||||
#include "common/config-manager.h"
|
||||
#include "audio/mixer.h"
|
||||
|
||||
#include "saga2/std.h"
|
||||
#include "saga2/intrface.h"
|
||||
#include "saga2/grequest.h"
|
||||
@ -47,7 +50,6 @@
|
||||
#include "saga2/vpal.h"
|
||||
#include "saga2/palette.h"
|
||||
|
||||
#include "saga2/config.h"
|
||||
#include "saga2/fontlib.h"
|
||||
#include "saga2/savefile.h"
|
||||
|
||||
@ -88,7 +90,6 @@ APPFUNCV(cmdSaveVolumeSettings);
|
||||
* ===================================================================== */
|
||||
extern BackWindow *mainWindow;
|
||||
extern audioInterface *audio;
|
||||
extern configuration globalConfig;
|
||||
extern bool fullInitialized;
|
||||
|
||||
/* ===================================================================== *
|
||||
@ -895,22 +896,22 @@ int16 OptionsDialog(bool disableSaveResume) {
|
||||
|
||||
speechTextBtn = new gOwnerSelCompButton(*win, optionsButtonRects[7],
|
||||
checkImag, numBtnImages, 0, cmdSpeechText);
|
||||
speechTextBtn->select(globalConfig.speechText);
|
||||
speechTextBtn->select(g_vm->_speechText);
|
||||
|
||||
nightBtn = new gOwnerSelCompButton(*win, optionsButtonRects[8],
|
||||
checkImag, numBtnImages, 0, cmdNight);
|
||||
nightBtn->select(globalConfig.showNight);
|
||||
nightBtn->select(g_vm->_showNight);
|
||||
|
||||
new gSlider(*win, optTopSliderRect, optTopFaceRect, 0,
|
||||
127, slideFaceImag, numSlideFace, globalConfig.soundVolume,
|
||||
Audio::Mixer::kMaxMixerVolume, slideFaceImag, numSlideFace, ConfMan.getInt("sfx_volume"),
|
||||
0, cmdSetSoundVolume);
|
||||
|
||||
new gSlider(*win, optMidSliderRect, optMidFaceRect, 0,
|
||||
127, slideFaceImag, numSlideFace, globalConfig.voiceVolume,
|
||||
Audio::Mixer::kMaxMixerVolume, slideFaceImag, numSlideFace, ConfMan.getInt("speech_volume"),
|
||||
0, cmdSetSpeechVolume);
|
||||
|
||||
new gSlider(*win, optBotSliderRect, optBotFaceRect, 0,
|
||||
127, slideFaceImag, numSlideFace, globalConfig.musicVolume,
|
||||
Audio::Mixer::kMaxMixerVolume, slideFaceImag, numSlideFace, ConfMan.getInt("music_volume"),
|
||||
0, cmdSetMIDIVolume);
|
||||
|
||||
new CPlaqText(*win, optionsTextRects[0],
|
||||
@ -930,7 +931,7 @@ int16 OptionsDialog(bool disableSaveResume) {
|
||||
|
||||
EventLoop(rInfo.running, true);
|
||||
|
||||
writeConfig();
|
||||
g_vm->saveConfig();
|
||||
|
||||
// remove the window all attatched controls
|
||||
if (win) delete win;
|
||||
@ -1610,12 +1611,6 @@ void updateAutoWeaponButton(bool setting) {
|
||||
autoWeaponBtn->select(setting);
|
||||
}
|
||||
|
||||
//void updateShowNightButton( bool setting )
|
||||
//{
|
||||
// if ( nightBtn != nullptr )
|
||||
// nightBtn->select( setting );
|
||||
//}
|
||||
|
||||
// dialog appfuncs
|
||||
APPFUNC(cmdDialogQuit) {
|
||||
gWindow *win;
|
||||
@ -1775,6 +1770,9 @@ APPFUNC(cmdQuitGame) {
|
||||
inline int16 quantizedVolume(uint16 trueVolume) {
|
||||
int16 quantized = trueVolume & 0xFFF8;
|
||||
quantized += (quantized / 16);
|
||||
|
||||
quantized += 2; // In ScummVM the range is 0..255
|
||||
|
||||
return quantized;
|
||||
}
|
||||
|
||||
@ -1801,15 +1799,15 @@ APPFUNC(cmdAutoWeapon) {
|
||||
|
||||
APPFUNC(cmdNight) {
|
||||
if (isUserAction(ev)) {
|
||||
globalConfig.showNight = !globalConfig.showNight;
|
||||
nightBtn->select(globalConfig.showNight);
|
||||
g_vm->_showNight = !g_vm->_showNight;
|
||||
nightBtn->select(g_vm->_showNight);
|
||||
}
|
||||
}
|
||||
|
||||
APPFUNC(cmdSpeechText) {
|
||||
if (isUserAction(ev)) {
|
||||
globalConfig.speechText = !globalConfig.speechText;
|
||||
speechTextBtn->select(globalConfig.speechText);
|
||||
g_vm->_speechText = !g_vm->_speechText;
|
||||
speechTextBtn->select(g_vm->_speechText);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1819,8 +1817,8 @@ void volumeChanged(void);
|
||||
|
||||
APPFUNC(cmdSetMIDIVolume) {
|
||||
int16 v = quantizedVolume(ev.value);
|
||||
globalConfig.musicVolume = v;
|
||||
audio->setVolume(volMusic, volumeSetTo, globalConfig.musicVolume);
|
||||
ConfMan.setInt("music_volume", v);
|
||||
g_vm->syncSoundSettings();
|
||||
volumeChanged();
|
||||
}
|
||||
|
||||
@ -1828,11 +1826,9 @@ APPFUNC(cmdSetMIDIVolume) {
|
||||
|
||||
APPFUNC(cmdSetDIGVolume) {
|
||||
int16 v = quantizedVolume(ev.value);
|
||||
globalConfig.soundVolume = v;
|
||||
globalConfig.voiceVolume = v;
|
||||
//audio->setVolume(volVoice,volumeSetTo,globalConfig.voiceVolume);
|
||||
audio->setVolume(volSoundMaster, volumeSetTo, globalConfig.soundVolume);
|
||||
//setVideoVolume(globalConfig.soundVolume);
|
||||
ConfMan.setInt("speech_volume", v);
|
||||
ConfMan.setInt("sfx_volume", v);
|
||||
g_vm->syncSoundSettings();
|
||||
volumeChanged();
|
||||
}
|
||||
|
||||
@ -1840,8 +1836,8 @@ APPFUNC(cmdSetDIGVolume) {
|
||||
|
||||
APPFUNC(cmdSetSpeechVolume) {
|
||||
int16 v = quantizedVolume(ev.value);
|
||||
globalConfig.voiceVolume = v;
|
||||
audio->setVolume(volVoice, volumeSetTo, globalConfig.voiceVolume);
|
||||
ConfMan.setInt("speech_volume", v);
|
||||
g_vm->syncSoundSettings();
|
||||
volumeChanged();
|
||||
}
|
||||
|
||||
@ -1849,9 +1845,8 @@ APPFUNC(cmdSetSpeechVolume) {
|
||||
|
||||
APPFUNC(cmdSetSoundVolume) {
|
||||
int16 v = quantizedVolume(ev.value);
|
||||
globalConfig.soundVolume = v;
|
||||
audio->setVolume(volSandL, volumeSetTo, globalConfig.soundVolume);
|
||||
//setVideoVolume(globalConfig.soundVolume);
|
||||
ConfMan.setInt("sfx_volume", v);
|
||||
g_vm->syncSoundSettings();
|
||||
volumeChanged();
|
||||
}
|
||||
|
||||
@ -1859,7 +1854,7 @@ APPFUNC(cmdSetSoundVolume) {
|
||||
// This should be called when exiting the dialog to save the changes
|
||||
|
||||
APPFUNCV(cmdSaveVolumeSettings) {
|
||||
writeConfig();
|
||||
g_vm->saveConfig();
|
||||
}
|
||||
|
||||
} // end of namespace Saga2
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user