diff options
| author | Kamil Zbróg | 2013-11-26 19:21:00 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2013-11-26 19:21:00 +0000 |
| commit | 0f013bf6e1bed6a1e18aa1a4ea16ed1c0105f33d (patch) | |
| tree | 5c56337c12de20746611254168c4e7f29a4219ce | |
| parent | 15bb1c61eda48f09253ccb8d2a42ccad59f3b00a (diff) | |
| download | scummvm-rg350-0f013bf6e1bed6a1e18aa1a4ea16ed1c0105f33d.tar.gz scummvm-rg350-0f013bf6e1bed6a1e18aa1a4ea16ed1c0105f33d.tar.bz2 scummvm-rg350-0f013bf6e1bed6a1e18aa1a4ea16ed1c0105f33d.zip | |
PRINCE: compilation fix after merge from master
| -rw-r--r-- | engines/prince/configure.engine | 3 | ||||
| -rw-r--r-- | engines/prince/font.cpp | 4 | ||||
| -rw-r--r-- | engines/prince/font.h | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/engines/prince/configure.engine b/engines/prince/configure.engine new file mode 100644 index 0000000000..50740d9f41 --- /dev/null +++ b/engines/prince/configure.engine @@ -0,0 +1,3 @@ +# This file is included from the main "configure" script +# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] +add_engine prince "The Prince and The Coward" no diff --git a/engines/prince/font.cpp b/engines/prince/font.cpp index 33149c14e4..40b6d014e6 100644 --- a/engines/prince/font.cpp +++ b/engines/prince/font.cpp @@ -65,11 +65,11 @@ Font::ChrData Font::getChrData(byte chr) const { return chrData; } -int Font::getCharWidth(byte chr) const { +int Font::getCharWidth(uint32 chr) const { return getChrData(chr)._width; } -void Font::drawChar(Graphics::Surface *dst, byte chr, int posX, int posY, uint32 color) const { +void Font::drawChar(Graphics::Surface *dst, uint32 chr, int posX, int posY, uint32 color) const { const ChrData chrData = getChrData(chr); for (int y = 0; y < chrData._height; ++y) { diff --git a/engines/prince/font.h b/engines/prince/font.h index 020e12bf54..c41b176c72 100644 --- a/engines/prince/font.h +++ b/engines/prince/font.h @@ -45,11 +45,11 @@ public: virtual int getMaxCharWidth() const override; - virtual int getCharWidth(byte chr) const override; + virtual int getCharWidth(uint32 chr) const override; - virtual void drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) const override; + virtual void drawChar(Graphics::Surface *dst, uint32 chr, int x, int y, uint32 color) const override; - virtual int getKerningOffset(byte left, byte right) const { return -2; } + virtual int getKerningOffset(uint32 left, uint32 right) const override { return -2; } private: struct ChrData { |