diff options
Diffstat (limited to 'engines/wintermute/base/font')
| -rw-r--r-- | engines/wintermute/base/font/base_font_bitmap.cpp | 8 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font_storage.cpp | 8 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font_truetype.cpp | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp index ff1207b31f..a9d71e0fa1 100644 --- a/engines/wintermute/base/font/base_font_bitmap.cpp +++ b/engines/wintermute/base/font/base_font_bitmap.cpp @@ -256,8 +256,8 @@ void BaseFontBitmap::drawChar(byte c, int x, int y) { bool handled = false;
if (_sprite) {
_sprite->getCurrentFrame();
- if (_sprite->_currentFrame >= 0 && _sprite->_currentFrame < _sprite->_frames.getSize() && _sprite->_frames[_sprite->_currentFrame]) {
- if (_sprite->_frames[_sprite->_currentFrame]->_subframes.getSize() > 0) {
+ if (_sprite->_currentFrame >= 0 && _sprite->_currentFrame < (int32)_sprite->_frames.size() && _sprite->_frames[_sprite->_currentFrame]) {
+ if (_sprite->_frames[_sprite->_currentFrame]->_subframes.size() > 0) {
_sprite->_frames[_sprite->_currentFrame]->_subframes[0]->_surface->displayTrans(x, y, rect);
}
handled = true;
@@ -532,8 +532,8 @@ bool BaseFontBitmap::getWidths() { BaseSurface *surf = NULL;
if (_sprite) {
- if (_widthsFrame >= 0 && _widthsFrame < _sprite->_frames.getSize()) {
- if (_sprite->_frames[_widthsFrame] && _sprite->_frames[_widthsFrame]->_subframes.getSize() > 0) {
+ if (_widthsFrame >= 0 && _widthsFrame < (int32)_sprite->_frames.size()) {
+ if (_sprite->_frames[_widthsFrame] && (int32)_sprite->_frames[_widthsFrame]->_subframes.size() > 0) {
surf = _sprite->_frames[_widthsFrame]->_subframes[0]->_surface;
}
}
diff --git a/engines/wintermute/base/font/base_font_storage.cpp b/engines/wintermute/base/font/base_font_storage.cpp index bc7ab6f22c..298417ec32 100644 --- a/engines/wintermute/base/font/base_font_storage.cpp +++ b/engines/wintermute/base/font/base_font_storage.cpp @@ -51,7 +51,7 @@ BaseFontStorage::~BaseFontStorage() { //////////////////////////////////////////////////////////////////////////
bool BaseFontStorage::cleanup(bool warn) {
- for (int i = 0; i < _fonts.getSize(); i++) {
+ for (uint32 i = 0; i < _fonts.size(); i++) {
if (warn) {
_gameRef->LOG(0, "Removing orphan font '%s'", _fonts[i]->getFilename());
}
@@ -64,7 +64,7 @@ bool BaseFontStorage::cleanup(bool warn) { //////////////////////////////////////////////////////////////////////////
bool BaseFontStorage::initLoop() {
- for (int i = 0; i < _fonts.getSize(); i++) {
+ for (uint32 i = 0; i < _fonts.size(); i++) {
_fonts[i]->initLoop();
}
return STATUS_OK;
@@ -76,7 +76,7 @@ BaseFont *BaseFontStorage::addFont(const Common::String &filename) { return NULL;
}
- for (int i = 0; i < _fonts.getSize(); i++) {
+ for (uint32 i = 0; i < _fonts.size(); i++) {
if (scumm_stricmp(_fonts[i]->getFilename(), filename.c_str()) == 0) {
_fonts[i]->_refCount++;
return _fonts[i];
@@ -112,7 +112,7 @@ bool BaseFontStorage::removeFont(BaseFont *font) { return STATUS_FAILED;
}
- for (int i = 0; i < _fonts.getSize(); i++) {
+ for (uint32 i = 0; i < _fonts.size(); i++) {
if (_fonts[i] == font) {
_fonts[i]->_refCount--;
if (_fonts[i]->_refCount <= 0) {
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp index 2c8cd261a9..19c5cef7ee 100644 --- a/engines/wintermute/base/font/base_font_truetype.cpp +++ b/engines/wintermute/base/font/base_font_truetype.cpp @@ -69,7 +69,7 @@ BaseFontTT::BaseFontTT(BaseGame *inGame) : BaseFont(inGame) { BaseFontTT::~BaseFontTT(void) {
clearCache();
- for (int i = 0; i < _layers.getSize(); i++) {
+ for (uint32 i = 0; i < _layers.size(); i++) {
delete _layers[i];
}
_layers.clear();
@@ -224,7 +224,7 @@ void BaseFontTT::drawText(const byte *text, int x, int y, int width, TTextAlign if (surface) {
Rect32 rc;
BasePlatform::setRect(&rc, 0, 0, surface->getWidth(), surface->getHeight());
- for (int i = 0; i < _layers.getSize(); i++) {
+ for (uint32 i = 0; i < _layers.size(); i++) {
uint32 color = _layers[i]->_color;
uint32 origForceAlpha = renderer->_forceAlphaColor;
if (renderer->_forceAlphaColor != 0) {
@@ -433,7 +433,7 @@ bool BaseFontTT::loadBuffer(byte *buffer) { }
// create at least one layer
- if (_layers.getSize() == 0) {
+ if (_layers.size() == 0) {
BaseTTFontLayer *layer = new BaseTTFontLayer;
layer->_color = baseColor;
_layers.add(layer);
@@ -508,13 +508,13 @@ bool BaseFontTT::persist(BasePersistenceManager *persistMgr) { // persist layers
int numLayers;
if (persistMgr->getIsSaving()) {
- numLayers = _layers.getSize();
+ numLayers = _layers.size();
persistMgr->transfer(TMEMBER(numLayers));
for (int i = 0; i < numLayers; i++) {
_layers[i]->persist(persistMgr);
}
} else {
- numLayers = _layers.getSize();
+ numLayers = _layers.size();
persistMgr->transfer(TMEMBER(numLayers));
for (int i = 0; i < numLayers; i++) {
BaseTTFontLayer *layer = new BaseTTFontLayer;
|