diff --git a/README.md b/README.md index f1e7654..52aa41a 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,6 @@ mkxp reads configuration data from the file "mkxp.conf" contained in the current | defScreenH | int | 480 | Height the game window starts in | | fixedFramerate | int | 0 | FPS will be fixed to this amount. Ignored if 0. | | solidFonts | bool | false | Don't use alpha blending for fonts | -| fastSoundPitch | bool | true | Use cheap OpenAL pitch shifting for sounds (SE) | -| fastMusicPitch | bool | false | Use cheap OpenAL pitch shifting for music (BGM/BGS/ME) | | gameFolder | string | "." | mkxp will look for all game related files here | | allowSymlinks | bool | false | Allow symlinks to be followed in the game folder. | | customScript | string | "" | Execute a raw ruby script file instead of an RPG Maker game. | diff --git a/src/audio.cpp b/src/audio.cpp index 35f5a6a..9e26275 100644 --- a/src/audio.cpp +++ b/src/audio.cpp @@ -26,7 +26,6 @@ #include "intrulist.h" #include "filesystem.h" #include "exception.h" -#include "config.h" #include "al-util.h" #include @@ -301,8 +300,7 @@ struct SoundEmitter AL::Source::setVolume(src, _volume); #ifndef RUBBERBAND - if (shState->config().fastSoundPitch) - AL::Source::setPitch(src, clamp(pitch, 50, 150) / 100.f); + AL::Source::setPitch(src, clamp(pitch, 50, 150) / 100.f); #endif AL::Source::play(src); @@ -763,8 +761,7 @@ private: needsRewind = false; #ifndef RUBBERBAND - if (shState->config().fastMusicPitch) - AL::Source::setPitch(alSrc, pitch); + AL::Source::setPitch(alSrc, pitch); #endif } diff --git a/src/config.cpp b/src/config.cpp index 0852293..3525b0e 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -39,8 +39,6 @@ Config::Config() defScreenH(480), fixedFramerate(0), solidFonts(false), - fastSoundPitch(true), - fastMusicPitch(false), gameFolder("."), allowSymlinks(false) {} @@ -61,8 +59,6 @@ void Config::read() READ_VAL(defScreenH, Int); READ_VAL(fixedFramerate, Int); READ_VAL(solidFonts, Bool); - READ_VAL(fastSoundPitch, Bool); - READ_VAL(fastMusicPitch, Bool); READ_VAL(gameFolder, ByteArray); READ_VAL(allowSymlinks, Bool); READ_VAL(customScript, ByteArray); diff --git a/src/config.h b/src/config.h index bbe9b9f..869b59e 100644 --- a/src/config.h +++ b/src/config.h @@ -44,9 +44,6 @@ struct Config bool solidFonts; - bool fastSoundPitch; - bool fastMusicPitch; - QByteArray gameFolder; bool allowSymlinks;