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/soundeffect.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/resources/soundeffect.h') diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index bd1c3c00..92b0016a 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -37,7 +37,8 @@ class SoundEffect : public Resource /** * Destructor. */ - virtual ~SoundEffect(); + virtual + ~SoundEffect(); /** * Loads a sample from a buffer in memory. @@ -48,8 +49,8 @@ class SoundEffect : public Resource * @return NULL if the an error occurred, a valid pointer * otherwise. */ - static SoundEffect *load(void* buffer, unsigned int bufferSize, - const std::string &idPath); + static SoundEffect* + load(void* buffer, unsigned int bufferSize, const std::string &idPath); /** * Plays the sample. @@ -60,7 +61,8 @@ class SoundEffect : public Resource * @return true if the playback started properly * false otherwise. */ - virtual bool play(int loops, int volume); + virtual bool + play(int loops, int volume); protected: /** @@ -68,7 +70,7 @@ class SoundEffect : public Resource */ SoundEffect(const std::string &idPath, Mix_Chunk *soundEffect); - Mix_Chunk *soundEffect; + Mix_Chunk *mChunk; }; #endif -- cgit v1.2.3-70-g09d2