diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-01-04 00:05:28 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-01-04 00:05:28 +0100 |
| commit | 89a3f586a224328b430ba2483ce5c12b33709c6a (patch) | |
| tree | 691e1da1e297f7ea9045be5454747ca454680cb2 /src/sound/sound.h | |
| parent | c9335534d6bc7a59dbabf6976d41fd1e5edc8ab3 (diff) | |
| parent | 1d42c71645548ae86b438c84898a07b539f262ac (diff) | |
| download | colobot-89a3f586a224328b430ba2483ce5c12b33709c6a.tar.gz colobot-89a3f586a224328b430ba2483ce5c12b33709c6a.tar.bz2 colobot-89a3f586a224328b430ba2483ce5c12b33709c6a.zip | |
Merge branch 'dev' into dev-graphics
Diffstat (limited to 'src/sound/sound.h')
| -rw-r--r-- | src/sound/sound.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/sound/sound.h b/src/sound/sound.h index c2b890f..518e2ad 100644 --- a/src/sound/sound.h +++ b/src/sound/sound.h @@ -28,8 +28,6 @@ #include "common/iman.h" #include "common/logger.h" -#include "plugins/plugininterface.h" - #include <string> #include <iostream> #include <iomanip> @@ -152,7 +150,7 @@ enum SoundNext * \brief Sound plugin interface * */ -class CSoundInterface : public CPluginInterface +class CSoundInterface { public: inline CSoundInterface() { @@ -170,7 +168,7 @@ class CSoundInterface : public CPluginInterface * Function calls \link CSoundInterface::Cache() \endlink for each file */ inline void CacheAll(std::string path) { - for ( int i = 1; i < 69; i++ ) { + for ( int i = 1; i <= 81; i++ ) { std::stringstream filename; filename << path << "/sound" << std::setfill('0') << std::setw(3) << i << ".wav"; if ( !Cache(static_cast<Sound>(i), filename.str()) ) |