diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-27 14:54:09 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-27 14:54:09 +0000 |
| commit | 285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4 (patch) | |
| tree | 0a4e4169ffada0fbdc25fd91822a8c0fe678571c /src/sound.h | |
| parent | c24856707233ceb3995e43f8f7da63e65999df1e (diff) | |
| download | mana-client-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.tar.gz mana-client-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.tar.bz2 mana-client-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.tar.xz mana-client-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.zip | |
Merged another bunch of changes from trunk to 0.0 to reduce the difference.
Diffstat (limited to 'src/sound.h')
| -rw-r--r-- | src/sound.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sound.h b/src/sound.h index 34490d9a..ebcd6442 100644 --- a/src/sound.h +++ b/src/sound.h @@ -65,7 +65,7 @@ class Sound { * @param path The full path to the music file. * @param loop The number of times the song is played (-1 = infinite) */ - void playMusic(const char *path, int loop = -1); + void playMusic(const std::string &path, int loop = -1); /** * Stops currently running background music track. @@ -79,7 +79,8 @@ class Sound { * @param loop The number of times the song is played (-1 = infinite) * @param ms Duration of fade-in effect (ms) */ - void fadeInMusic(const char *path, int loop = -1, int ms = 2000); + void fadeInMusic(const std::string &path, int loop = -1, + int ms = 2000); /** * Fades out currently running background music track. |