aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2013-04-19 18:13:42 +0200
committerEinar Johan Trøan Sømåen2013-04-19 18:13:42 +0200
commita2fb3dfe9e6de6241962a41b9d98e38e84441b44 (patch)
tree355363efd43e2083041ea5849ff330dcdab153a8 /engines
parent315550c0f8ac2019fe45f0632917c0fb26093427 (diff)
downloadscummvm-rg350-a2fb3dfe9e6de6241962a41b9d98e38e84441b44.tar.gz
scummvm-rg350-a2fb3dfe9e6de6241962a41b9d98e38e84441b44.tar.bz2
scummvm-rg350-a2fb3dfe9e6de6241962a41b9d98e38e84441b44.zip
WINTERMUTE: Replace a few more ints by int32s.
Diffstat (limited to 'engines')
-rw-r--r--engines/wintermute/base/font/base_font_bitmap.h8
-rw-r--r--engines/wintermute/base/font/base_font_truetype.h16
-rw-r--r--engines/wintermute/base/scriptables/script.cpp2
-rw-r--r--engines/wintermute/base/scriptables/script_value.cpp2
4 files changed, 14 insertions, 14 deletions
diff --git a/engines/wintermute/base/font/base_font_bitmap.h b/engines/wintermute/base/font/base_font_bitmap.h
index e380a949e2..73cafb5d75 100644
--- a/engines/wintermute/base/font/base_font_bitmap.h
+++ b/engines/wintermute/base/font/base_font_bitmap.h
@@ -50,11 +50,11 @@ public:
private:
bool getWidths();
BaseSprite *_sprite;
- int _widthsFrame;
+ int32 _widthsFrame;
bool _fontextFix;
- int _numColumns;
- int _tileHeight;
- int _tileWidth;
+ int32 _numColumns;
+ int32 _tileHeight;
+ int32 _tileWidth;
byte _widths[NUM_CHARACTERS];
BaseSubFrame *_subframe;
bool _wholeCell;
diff --git a/engines/wintermute/base/font/base_font_truetype.h b/engines/wintermute/base/font/base_font_truetype.h
index c9ac4cd993..e532a5b317 100644
--- a/engines/wintermute/base/font/base_font_truetype.h
+++ b/engines/wintermute/base/font/base_font_truetype.h
@@ -46,13 +46,13 @@ private:
class BaseCachedTTFontText {
public:
WideString _text;
- int _width;
+ int32 _width;
TTextAlign _align;
- int _maxHeight;
- int _maxLength;
+ int32 _maxHeight;
+ int32 _maxLength;
BaseSurface *_surface;
- int _priority;
- int _textOffset;
+ int32 _priority;
+ int32 _textOffset;
bool _marked;
uint32 _lastUsed;
@@ -90,8 +90,8 @@ public:
return STATUS_OK;
}
- int _offsetX;
- int _offsetY;
+ int32 _offsetX;
+ int32 _offsetY;
uint32 _color;
};
@@ -140,7 +140,7 @@ public:
bool _isItalic;
bool _isUnderline;
bool _isStriked;
- int _fontHeight;
+ int32 _fontHeight;
char *_fontFile;
BaseArray<BaseTTFontLayer *> _layers;
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index 2d7b3329c8..1b945c2e1c 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -1252,7 +1252,7 @@ bool ScScript::persist(BasePersistenceManager *persistMgr) {
persistMgr->putBytes(_buffer, _bufferSize);
} else {
// don't save idle/finished scripts
- int bufferSize = 0;
+ int32 bufferSize = 0;
persistMgr->transfer(TMEMBER(bufferSize));
}
} else {
diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp
index 5ad8a84baa..e41808ec4a 100644
--- a/engines/wintermute/base/scriptables/script_value.cpp
+++ b/engines/wintermute/base/scriptables/script_value.cpp
@@ -799,7 +799,7 @@ bool ScValue::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_valInt));
persistMgr->transferPtr(TMEMBER_PTR(_valNative));
- int size;
+ int32 size;
const char *str;
if (persistMgr->getIsSaving()) {
size = _valObject.size();