diff options
| author | yinsimei | 2017-06-05 19:35:03 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-07-13 18:27:45 +0200 |
| commit | 7430ebe8830f58ae8fd1c123bfd7b08031a0f8b1 (patch) | |
| tree | 3241743506e6fe836c667e449a74fbfc79ef3f01 /engines/sludge/fonttext.cpp | |
| parent | a8ccd053157f18c5d125bb114cdb1e17ac17460a (diff) | |
| download | scummvm-rg350-7430ebe8830f58ae8fd1c123bfd7b08031a0f8b1.tar.gz scummvm-rg350-7430ebe8830f58ae8fd1c123bfd7b08031a0f8b1.tar.bz2 scummvm-rg350-7430ebe8830f58ae8fd1c123bfd7b08031a0f8b1.zip | |
SLUDGE: use scummvm int type instead of uint16/32_t
Diffstat (limited to 'engines/sludge/fonttext.cpp')
| -rw-r--r-- | engines/sludge/fonttext.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/sludge/fonttext.cpp b/engines/sludge/fonttext.cpp index bf7de8b4e5..f66cde54d6 100644 --- a/engines/sludge/fonttext.cpp +++ b/engines/sludge/fonttext.cpp @@ -38,10 +38,10 @@ int fontHeight = 0, numFontColours, loadedFontNum; char *fontOrderString = NULL; short fontSpace = -1; -uint32_t *fontTable = NULL; +uint32 *fontTable = NULL; unsigned int fontTableSize = 0; -#define fontInTable(x) ((x<fontTableSize) ? fontTable[(uint32_t) x] : 0) +#define fontInTable(x) ((x<fontTableSize) ? fontTable[(uint32) x] : 0) extern float cameraZoom; @@ -56,7 +56,7 @@ bool isInFont(char *theText) { return false; int i = 0; - uint32_t c = u8_nextchar(theText, &i); + uint32 c = u8_nextchar(theText, &i); return u8_strchr(fontOrderString, c, &i); } @@ -67,7 +67,7 @@ int stringLength(char *theText) { int stringWidth(char *theText) { int a = 0; - uint32_t c; + uint32 c; int xOff = 0; if (!fontTableSize) @@ -84,7 +84,7 @@ int stringWidth(char *theText) { void pasteString(char *theText, int xOff, int y, spritePalette &thePal) { sprite *mySprite; int a = 0; - uint32_t c; + uint32 c; if (!fontTableSize) return; @@ -101,7 +101,7 @@ void pasteString(char *theText, int xOff, int y, spritePalette &thePal) { void pasteStringToBackdrop(char *theText, int xOff, int y, spritePalette &thePal) { sprite *mySprite; int a = 0; - uint32_t c; + uint32 c; if (!fontTableSize) return; @@ -118,7 +118,7 @@ void pasteStringToBackdrop(char *theText, int xOff, int y, spritePalette &thePal void burnStringToBackdrop(char *theText, int xOff, int y, spritePalette &thePal) { sprite *mySprite; int a = 0; - uint32_t c; + uint32 c; if (!fontTableSize) return; @@ -167,7 +167,7 @@ void setFontColour(spritePalette &sP, byte r, byte g, byte b) { bool loadFont(int filenum, const char *charOrder, int h) { int a = 0; - uint32_t c; + uint32 c; delete[] fontOrderString; fontOrderString = copyString(charOrder); @@ -185,7 +185,7 @@ bool loadFont(int filenum, const char *charOrder, int h) { fontTableSize++; delete[] fontTable; - fontTable = new uint32_t[fontTableSize]; + fontTable = new uint32[fontTableSize]; if (!checkNew(fontTable)) return false; |