aboutsummaryrefslogtreecommitdiff
path: root/engines/cryomni3d/font_manager.h
diff options
context:
space:
mode:
authorLe Philousophe2019-05-26 18:29:57 +0200
committerEugene Sandulenko2019-06-01 22:43:48 +0200
commitff197718c239e10209d8eaf26c90c11af5ed1c80 (patch)
tree18a344711b6d3388cf450a41dc88f6a223640d33 /engines/cryomni3d/font_manager.h
parent222f6b0e4cd5afc3d6aae8210b71908b111fca19 (diff)
downloadscummvm-rg350-ff197718c239e10209d8eaf26c90c11af5ed1c80.tar.gz
scummvm-rg350-ff197718c239e10209d8eaf26c90c11af5ed1c80.tar.bz2
scummvm-rg350-ff197718c239e10209d8eaf26c90c11af5ed1c80.zip
CRYOMNI3D: Rename unsigned int to uint
Diffstat (limited to 'engines/cryomni3d/font_manager.h')
-rw-r--r--engines/cryomni3d/font_manager.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/engines/cryomni3d/font_manager.h b/engines/cryomni3d/font_manager.h
index 24b45f5560..0ac4fe35ff 100644
--- a/engines/cryomni3d/font_manager.h
+++ b/engines/cryomni3d/font_manager.h
@@ -44,22 +44,22 @@ public:
void loadFonts(const Common::Array<Common::String> &fontFiles);
void setCurrentFont(int currentFont);
- unsigned int getCurrentFont() { return _currentFontId; }
+ uint getCurrentFont() { return _currentFontId; }
void setTransparentBackground(bool transparent) { _transparentBackground = transparent; }
- void setSpaceWidth(unsigned int additionalSpace);
+ void setSpaceWidth(uint additionalSpace);
void setForeColor(byte color) { _foreColor = color; }
void setLineHeight(int h) { _lineHeight = h; }
int lineHeight() { return _lineHeight; }
- void setCharSpacing(unsigned int w) { _charSpacing = w; }
+ void setCharSpacing(uint w) { _charSpacing = w; }
void setSurface(Graphics::ManagedSurface *surface) { _currentSurface = surface; }
int getFontMaxHeight() { return _currentFont->maxHeight; }
- void displayInt(unsigned int x, unsigned int y, int value) const { displayStr_(x, y, Common::String::format("%d", value)); }
- void displayStr(unsigned int x, unsigned int y, const Common::String &text) const { displayStr_(x, y, text); }
- unsigned int getStrWidth(const Common::String &text) const;
+ void displayInt(uint x, uint y, int value) const { displayStr_(x, y, Common::String::format("%d", value)); }
+ void displayStr(uint x, uint y, const Common::String &text) const { displayStr_(x, y, text); }
+ uint getStrWidth(const Common::String &text) const;
- unsigned int getLinesCount(const Common::String &text, unsigned int width);
+ uint getLinesCount(const Common::String &text, uint width);
void setupBlock(const Common::Rect &block, bool justifyText = false) { _blockRect = block; _blockPos.x = block.left; _blockPos.y = block.top; _justifyText = justifyText; }
bool displayBlockText(const Common::String &text) { return displayBlockText(text, text.begin()); }
@@ -69,10 +69,10 @@ public:
private:
void loadFont(Common::ReadStream &font_fl);
- unsigned int displayStr_(unsigned int x, unsigned int y, const Common::String &text) const;
- unsigned int displayChar(unsigned int x, unsigned int y, unsigned char c) const;
+ uint displayStr_(uint x, uint y, const Common::String &text) const;
+ uint displayChar(uint x, uint y, unsigned char c) const;
void calculateWordWrap(const Common::String &text, Common::String::const_iterator *position,
- unsigned int *finalPos, bool *has_br, Common::Array<Common::String> &words) const;
+ uint *finalPos, bool *has_br, Common::Array<Common::String> &words) const;
struct Character {
uint16 h;
@@ -86,7 +86,7 @@ private:
Character();
~Character();
- unsigned int setup(uint16 width, uint16 height);
+ uint setup(uint16 width, uint16 height);
};
struct Font {
@@ -99,10 +99,10 @@ private:
Common::Array<Font *> _fonts;
const Font *_currentFont;
- unsigned int _currentFontId;
+ uint _currentFontId;
bool _transparentBackground;
- unsigned int _spaceWidth;
- unsigned int _charSpacing;
+ uint _spaceWidth;
+ uint _charSpacing;
byte _foreColor;