diff options
| author | Max Horn | 2004-09-25 23:26:46 +0000 |
|---|---|---|
| committer | Max Horn | 2004-09-25 23:26:46 +0000 |
| commit | 61b7e2155a958c471771da3339a8f1ffcfd633de (patch) | |
| tree | f8595d035e6c432155410ffcd4db325c5d331b5a | |
| parent | db00315d5ba6d69e8db72d8e0e5631b657825835 (diff) | |
| download | scummvm-rg350-61b7e2155a958c471771da3339a8f1ffcfd633de.tar.gz scummvm-rg350-61b7e2155a958c471771da3339a8f1ffcfd633de.tar.bz2 scummvm-rg350-61b7e2155a958c471771da3339a8f1ffcfd633de.zip | |
Fix doxygen warnings
svn-id: r15277
| -rw-r--r-- | saga/transitions.cpp | 2 | ||||
| -rw-r--r-- | scumm/imuse_digi/dimuse.h | 2 | ||||
| -rw-r--r-- | sound/audiostream.h | 6 | ||||
| -rw-r--r-- | sword2/driver/palette.cpp | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/saga/transitions.cpp b/saga/transitions.cpp index 28cc7f6932..55c8d61ee9 100644 --- a/saga/transitions.cpp +++ b/saga/transitions.cpp @@ -28,7 +28,7 @@ namespace Saga { /*! @brief dissolve one image with another - @param flag if set to 1, do zero masking + @param flags if set to 1, do zero masking */ int SagaEngine::transitionDissolve(byte *dst_img, int dst_w, int dst_h, int dst_p, const byte *src_img, int src_w, int src_h, int src_p, int flags, int x, int y, diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h index 4c214e3e8b..95b47052df 100644 --- a/scumm/imuse_digi/dimuse.h +++ b/scumm/imuse_digi/dimuse.h @@ -135,7 +135,7 @@ public: void startMusic(int soundId, int volume); void startMusic(const char *soundName, int soundId, int hookId, int volume); void startSfx(int soundId, int priority); - void startSound(int soundId) + void startSound(int sound) { error("MusicEngine::startSound() Should be never called"); } void saveOrLoad(Serializer *ser); diff --git a/sound/audiostream.h b/sound/audiostream.h index bd39c04c2b..bf31d5ae7c 100644 --- a/sound/audiostream.h +++ b/sound/audiostream.h @@ -81,12 +81,12 @@ public: * Tries to load a file by trying all available formats. * In case of an error, the file handle will be closed, but deleting * it is still the responsibilty of the caller. - * @param filename a filename without an extension - * @param fileHandle a pointer to an existing File instance + * @param filename a filename without an extension + * @param path an (optional) file path which is passed to File::open() * @return an Audiostream ready to use in case of success; * NULL in case of an error (e.g. invalid/nonexisting file) */ - static AudioStream* openStreamFile(const char* filename, const char* path=NULL); + static AudioStream* openStreamFile(const char *filename, const char *path = NULL); }; class AppendableAudioStream : public AudioStream { diff --git a/sword2/driver/palette.cpp b/sword2/driver/palette.cpp index c63f8a1439..621ac1a7a1 100644 --- a/sword2/driver/palette.cpp +++ b/sword2/driver/palette.cpp @@ -54,6 +54,7 @@ uint8 Graphics::quickMatch(uint8 r, uint8 g, uint8 b) { * @param startEntry the first colour entry to set * @param noEntries the number of colour entries to set * @param colourTable the new colour entries + * @param fadeNow whether to perform the change immediately or delayed */ void Graphics::setPalette(int16 startEntry, int16 noEntries, byte *colourTable, uint8 fadeNow) { |