diff options
| author | Ira Rice <irarice@gmail.com> | 2008-11-18 06:45:46 +0000 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2008-11-18 06:45:46 +0000 |
| commit | 40f2ec0582932bb21952cb58c5e51ca508206cae (patch) | |
| tree | 7512211b9766729743fc0403db960fa229d3ecc2 /src/resources/dye.h | |
| parent | 717e8babd1124a4c6c685a6386a84f58148d4931 (diff) | |
| download | mana-40f2ec0582932bb21952cb58c5e51ca508206cae.tar.gz mana-40f2ec0582932bb21952cb58c5e51ca508206cae.tar.bz2 mana-40f2ec0582932bb21952cb58c5e51ca508206cae.tar.xz mana-40f2ec0582932bb21952cb58c5e51ca508206cae.zip | |
Pedantic fixes to the client, where I alphabetized all of the include
statements, as well as removing the new skill dialog, which we do not,
nor will we use (if we do, it'd be a new one that we'd make).
WARNING!!! This, and all other previous builds have a linker error for
the Gnome libraries version 4.3.2 on my setup. It's assumed that this is
also the case for other users of this library as well. I'm currently
assuming that there's a bug in the compiler itself, and will look into
reporting this, but in the mean time, it doesn't build for these users,
unfortunately. Sorry about this.
Diffstat (limited to 'src/resources/dye.h')
| -rw-r--r-- | src/resources/dye.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/resources/dye.h b/src/resources/dye.h index fe8669bb..4fb8fd40 100644 --- a/src/resources/dye.h +++ b/src/resources/dye.h @@ -17,13 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: dye.h 3706 2007-11-03 21:04:51Z gmelquio $ */ #ifndef _TMW_DYE_H #define _TMW_DYE_H +#include <string> #include <vector> /** @@ -38,7 +37,7 @@ class Palette * The string is either a file name or a sequence of hexadecimal RGB * values separated by ',' and starting with '#'. */ - Palette(std::string const &); + Palette(std::string const &pallete); /** * Gets a pixel color depending on its intensity. @@ -65,7 +64,7 @@ class Dye * The parts of string are separated by semi-colons. Each part starts * by an uppercase letter, followed by a colon and then a palette name. */ - Dye(std::string const &); + Dye(std::string const &dye); /** * Destroys the associated palettes. |