From 8bde9095c5840b8d62ebafe11beaed98877d6ac2 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sun, 9 Oct 2005 03:34:45 +0000 Subject: * Made Sprite into an interface implemented by both FloorItem and Being, which hook themselves into the map on construction. The improved fringe layer is working as expected now. * Made sure TMW compiles without warnings even when using "-Wconversion -Wshadow -Wcast-qual -Wwrite-strings -ansi -pedantic", lots of cleanups. * Added two new small tilesets that contain the desert tiles that are twice and three times the height of a normal tile. One well in new_3-1 has been converted to use the new double tiles for testing purposes. --- src/resources/music.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/resources/music.h') diff --git a/src/resources/music.h b/src/resources/music.h index 4858eb86..9cf75928 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -48,7 +48,8 @@ class Music : public Resource * @return NULL if the an error occurred, a valid pointer * otherwise. */ - static Music *load(void* buffer, unsigned int bufferSize, const std::string &idPath); + static Music* + load(void* buffer, unsigned int bufferSize, const std::string &idPath); /** * Plays the music. @@ -58,15 +59,14 @@ class Music : public Resource * @return true if the playback started properly * false otherwise. */ - virtual bool play(int loops); + virtual bool + play(int loops); /** * Stops the music. - * - * @return true if the playback was stopped properly - * false otherwise. */ - virtual bool stop(); + virtual void + stop(); protected: /** @@ -75,8 +75,8 @@ class Music : public Resource Music(const std::string &idPath, Mix_Chunk *music); //Mix_Music *music; - Mix_Chunk *music; - int channel; + Mix_Chunk *mChunk; + int mChannel; }; #endif -- cgit v1.2.3-70-g09d2