diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
| commit | a1e61f8446b7928d854a062f6494e75fe3fec9ab (patch) | |
| tree | 953cba5593a49f818612f38de1149a2763a36aa8 /src/resources | |
| parent | 79cb8fa1ca81440e21bcb186785d47c50a608e8e (diff) | |
| parent | 8954a7ca0f70bbf167c9119d26c7bca8407e8da6 (diff) | |
| download | mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.gz mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.bz2 mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.xz mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.zip | |
Merge github.com:mana/mana
Conflicts:
src/localplayer.cpp
src/net/manaserv/beinghandler.cpp
src/net/manaserv/charhandler.cpp
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/resourcemanager.h | 8 | ||||
| -rw-r--r-- | src/resources/theme.h | 4 | ||||
| -rw-r--r-- | src/resources/userpalette.h | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index 870182e4..9b40814f 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -128,11 +128,11 @@ class ResourceManager /** * Adds a preformatted resource to the resource map. * - * @param path The file name. - * @param Resource The Resource to add. - * @return true if successfull, false otherwise. + * @param idPath The resource identifier path. + * @param resource The Resource to add. + * @return true if successful, false otherwise. */ - bool addResource(const std::string &idPath, Resource* resource); + bool addResource(const std::string &idPath, Resource *resource); /** * Copies a file from one place to another (useful for extracting diff --git a/src/resources/theme.h b/src/resources/theme.h index d6d660e2..57274291 100644 --- a/src/resources/theme.h +++ b/src/resources/theme.h @@ -183,12 +183,12 @@ class Theme : public Palette, public EventListener * * @return the requested color */ - inline static const gcn::Color &getThemeColor(int type, int alpha = 255) + static const gcn::Color &getThemeColor(int type, int alpha = 255) { return mInstance->getColor(type, alpha); } - const static gcn::Color &getThemeColor(char c, bool &valid) + static const gcn::Color &getThemeColor(char c, bool &valid) { return mInstance->getColor(c, valid); } diff --git a/src/resources/userpalette.h b/src/resources/userpalette.h index 01f66ca7..1dd5cf6a 100644 --- a/src/resources/userpalette.h +++ b/src/resources/userpalette.h @@ -114,8 +114,6 @@ class UserPalette : public Palette, public gcn::ListModel /** * Sets the gradient delay for the specified color. - * - * @param grad gradient type to set */ void setGradientDelay(int type, int delay) { mColors[type].delay = delay; } @@ -191,7 +189,6 @@ class UserPalette : public Palette, public gcn::ListModel /** * Initialise color * - * @param c character that needs initialising * @param rgb default color if not found in config * @param text identifier of color */ |