[Scummvm-cvs-logs] scummvm master -> c5bd3ecb130186c8490b4293a5b4eb4d61780c7a
somaen
einarjohants at gmail.com
Fri Apr 19 18:22:01 CEST 2013
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a2fb3dfe9e WINTERMUTE: Replace a few more ints by int32s.
9184bb5c24 WINTERMUTE: Add overrides to Font-classes.
c5bd3ecb13 WINTERMUTE: Change more int's to int32s.
Commit: a2fb3dfe9e6de6241962a41b9d98e38e84441b44
https://github.com/scummvm/scummvm/commit/a2fb3dfe9e6de6241962a41b9d98e38e84441b44
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-04-19T09:13:42-07:00
Commit Message:
WINTERMUTE: Replace a few more ints by int32s.
Changed paths:
engines/wintermute/base/font/base_font_bitmap.h
engines/wintermute/base/font/base_font_truetype.h
engines/wintermute/base/scriptables/script.cpp
engines/wintermute/base/scriptables/script_value.cpp
diff --git a/engines/wintermute/base/font/base_font_bitmap.h b/engines/wintermute/base/font/base_font_bitmap.h
index e380a94..73cafb5 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 c9ac4cd..e532a5b 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 2d7b332..1b945c2 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 5ad8a84..e41808e 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();
Commit: 9184bb5c243604709a44188794f89979e761c605
https://github.com/scummvm/scummvm/commit/9184bb5c243604709a44188794f89979e761c605
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-04-19T09:15:25-07:00
Commit Message:
WINTERMUTE: Add overrides to Font-classes.
Changed paths:
engines/wintermute/base/font/base_font_bitmap.h
engines/wintermute/base/font/base_font_truetype.h
diff --git a/engines/wintermute/base/font/base_font_bitmap.h b/engines/wintermute/base/font/base_font_bitmap.h
index 73cafb5..0bdac64 100644
--- a/engines/wintermute/base/font/base_font_bitmap.h
+++ b/engines/wintermute/base/font/base_font_bitmap.h
@@ -39,10 +39,10 @@ public:
DECLARE_PERSISTENT(BaseFontBitmap, BaseFont)
bool loadBuffer(byte *Buffer);
bool loadFile(const Common::String &filename);
- virtual int getTextWidth(const byte *text, int maxLength = -1);
- virtual int getTextHeight(const byte *text, int width);
- virtual void drawText(const byte *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLength = -1);
- virtual int getLetterHeight();
+ virtual int getTextWidth(const byte *text, int maxLength = -1) override;
+ virtual int getTextHeight(const byte *text, int width) override;
+ virtual void drawText(const byte *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLength = -1) override;
+ virtual int getLetterHeight() override;
BaseFontBitmap(BaseGame *inGame);
virtual ~BaseFontBitmap();
diff --git a/engines/wintermute/base/font/base_font_truetype.h b/engines/wintermute/base/font/base_font_truetype.h
index e532a5b..f935059 100644
--- a/engines/wintermute/base/font/base_font_truetype.h
+++ b/engines/wintermute/base/font/base_font_truetype.h
@@ -100,10 +100,10 @@ public:
BaseFontTT(BaseGame *inGame);
virtual ~BaseFontTT(void);
- virtual int getTextWidth(const byte *text, int maxLength = -1);
- virtual int getTextHeight(const byte *text, int width);
- virtual void drawText(const byte *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLength = -1);
- virtual int getLetterHeight();
+ virtual int getTextWidth(const byte *text, int maxLength = -1) override;
+ virtual int getTextHeight(const byte *text, int width) override;
+ virtual void drawText(const byte *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLength = -1) override;
+ virtual int getLetterHeight() override;
bool loadBuffer(byte *buffer);
bool loadFile(const Common::String &filename);
Commit: c5bd3ecb130186c8490b4293a5b4eb4d61780c7a
https://github.com/scummvm/scummvm/commit/c5bd3ecb130186c8490b4293a5b4eb4d61780c7a
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-04-19T09:20:43-07:00
Commit Message:
WINTERMUTE: Change more int's to int32s.
Changed paths:
engines/wintermute/ad/ad_scene.h
engines/wintermute/base/base_sprite.h
engines/wintermute/base/base_sub_frame.h
engines/wintermute/base/particles/part_emitter.h
diff --git a/engines/wintermute/ad/ad_scene.h b/engines/wintermute/ad/ad_scene.h
index 9ddef73..a129bfb 100644
--- a/engines/wintermute/ad/ad_scene.h
+++ b/engines/wintermute/ad/ad_scene.h
@@ -98,14 +98,14 @@ public:
void scrollTo(int offsetX, int offsetY);
virtual bool update() override;
bool _autoScroll;
- int _targetOffsetTop;
- int _targetOffsetLeft;
+ int32 _targetOffsetTop;
+ int32 _targetOffsetLeft;
- int _scrollPixelsV;
+ int32 _scrollPixelsV;
uint32 _scrollTimeV;
uint32 _lastTimeV;
- int _scrollPixelsH;
+ int32 _scrollPixelsH;
uint32 _scrollTimeH;
uint32 _lastTimeH;
@@ -171,8 +171,8 @@ private:
BaseObject *_pfRequester;
BaseArray<AdPathPoint *> _pfPath;
- int _offsetTop;
- int _offsetLeft;
+ int32 _offsetTop;
+ int32 _offsetLeft;
};
diff --git a/engines/wintermute/base/base_sprite.h b/engines/wintermute/base/base_sprite.h
index 24c1f47..05cb9fc 100644
--- a/engines/wintermute/base/base_sprite.h
+++ b/engines/wintermute/base/base_sprite.h
@@ -56,7 +56,7 @@ public:
bool loadFile(const Common::String &filename, int lifeTime = -1, TSpriteCacheType cacheType = CACHE_ALL);
bool draw(int x, int y, BaseObject *Register = nullptr, float zoomX = 100, float zoomY = 100, uint32 alpha = 0xFFFFFFFF);
bool _looping;
- int _currentFrame;
+ int32 _currentFrame;
bool addFrame(const char *filename, uint32 delay = 0, int hotspotX = 0, int hotspotY = 0, Rect32 *rect = nullptr);
BaseSprite(BaseGame *inGame, BaseObject *owner = nullptr);
virtual ~BaseSprite();
diff --git a/engines/wintermute/base/base_sub_frame.h b/engines/wintermute/base/base_sub_frame.h
index 1ecf6c6..37ba34b 100644
--- a/engines/wintermute/base/base_sub_frame.h
+++ b/engines/wintermute/base/base_sub_frame.h
@@ -56,8 +56,8 @@ public:
bool getBoundingRect(Rect32 *rect, int x, int y, float scaleX = 100, float scaleY = 100);
const char* getSurfaceFilename();
- int _hotspotX;
- int _hotspotY;
+ int32 _hotspotX;
+ int32 _hotspotY;
uint32 _alpha;
// These two setters and getters are rather usefull, as they allow _rect to be lazily defined
// Thus we don't need to load the actual graphics before the rect is actually needed.
diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h
index cbc0aa4..a0d701f 100644
--- a/engines/wintermute/base/particles/part_emitter.h
+++ b/engines/wintermute/base/particles/part_emitter.h
@@ -94,31 +94,31 @@ private:
float _scale2;
bool _scaleZBased;
- int _maxParticles;
+ int32 _maxParticles;
- int _lifeTime1;
- int _lifeTime2;
+ int32 _lifeTime1;
+ int32 _lifeTime2;
bool _lifeTimeZBased;
- int _genInterval;
- int _genAmount;
+ int32 _genInterval;
+ int32 _genAmount;
bool _running;
- int _overheadTime;
+ int32 _overheadTime;
- int _maxBatches;
- int _batchesGenerated;
+ int32 _maxBatches;
+ int32 _batchesGenerated;
Rect32 _border;
- int _borderThicknessLeft;
- int _borderThicknessRight;
- int _borderThicknessTop;
- int _borderThicknessBottom;
+ int32 _borderThicknessLeft;
+ int32 _borderThicknessRight;
+ int32 _borderThicknessTop;
+ int32 _borderThicknessBottom;
- int _fadeInTime;
+ int32 _fadeInTime;
- int _alpha1;
- int _alpha2;
+ int32 _alpha1;
+ int32 _alpha2;
bool _alphaTimeBased;
bool _useRegion;
More information about the Scummvm-git-logs
mailing list