diff options
| author | anotherguest | 2013-11-26 12:14:38 +0100 |
|---|---|---|
| committer | anotherguest | 2013-11-26 12:14:38 +0100 |
| commit | 44947f5bdb45095793f1e994385f051d534d53ee (patch) | |
| tree | 7bfc07044c7a1d585fa5145ef91bfb6f9fb6e242 /engines/groovie | |
| parent | ed357a6dfacd2fd41366d2baf61bd344fec9a0a0 (diff) | |
| parent | 0e017f007a8a3db8c8d8320f76cbfd423e662e07 (diff) | |
| download | scummvm-rg350-44947f5bdb45095793f1e994385f051d534d53ee.tar.gz scummvm-rg350-44947f5bdb45095793f1e994385f051d534d53ee.tar.bz2 scummvm-rg350-44947f5bdb45095793f1e994385f051d534d53ee.zip | |
Merge branch 'master' of github.com:scummvm/scummvm
Diffstat (limited to 'engines/groovie')
| -rw-r--r-- | engines/groovie/configure.engine | 4 | ||||
| -rw-r--r-- | engines/groovie/font.cpp | 4 | ||||
| -rw-r--r-- | engines/groovie/font.h | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/engines/groovie/configure.engine b/engines/groovie/configure.engine new file mode 100644 index 0000000000..84e95a70df --- /dev/null +++ b/engines/groovie/configure.engine @@ -0,0 +1,4 @@ +# This file is included from the main "configure" script +# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] +add_engine groovie "Groovie" yes "groovie2" "7th Guest" +add_engine groovie2 "Groovie 2 games" no "" "" "jpeg" diff --git a/engines/groovie/font.cpp b/engines/groovie/font.cpp index d29c22dd02..a55d8fad95 100644 --- a/engines/groovie/font.cpp +++ b/engines/groovie/font.cpp @@ -112,7 +112,7 @@ bool T7GFont::load(Common::SeekableReadStream &stream) { return true; } -void T7GFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) const { +void T7GFont::drawChar(Graphics::Surface *dst, uint32 chr, int x, int y, uint32 color) const { // We ignore the color, as the font is already colored const Glyph *glyph = getGlyph(chr); const byte *src = glyph->pixels; @@ -125,7 +125,7 @@ void T7GFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 co } } -const T7GFont::Glyph *T7GFont::getGlyph(byte chr) const { +const T7GFont::Glyph *T7GFont::getGlyph(uint32 chr) const { assert (chr < 128); byte numGlyph = _mapChar2Glyph[chr]; diff --git a/engines/groovie/font.h b/engines/groovie/font.h index 20aaa4cf23..49cf4b7b06 100644 --- a/engines/groovie/font.h +++ b/engines/groovie/font.h @@ -37,8 +37,8 @@ public: int getFontHeight() const { return _maxHeight; } int getMaxCharWidth() const { return _maxWidth; } - int getCharWidth(byte chr) const { return getGlyph(chr)->width; } - void drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) const; + int getCharWidth(uint32 chr) const { return getGlyph(chr)->width; } + void drawChar(Graphics::Surface *dst, uint32 chr, int x, int y, uint32 color) const; private: int _maxHeight, _maxWidth; @@ -55,7 +55,7 @@ private: byte _mapChar2Glyph[128]; Glyph *_glyphs; - const Glyph *getGlyph(byte chr) const; + const Glyph *getGlyph(uint32 chr) const; }; } // End of Groovie namespace |