aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/base_sub_frame.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/base/base_sub_frame.h')
-rw-r--r--engines/wintermute/base/base_sub_frame.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/wintermute/base/base_sub_frame.h b/engines/wintermute/base/base_sub_frame.h
index c173ae69d1..1ecf6c671d 100644
--- a/engines/wintermute/base/base_sub_frame.h
+++ b/engines/wintermute/base/base_sub_frame.h
@@ -52,7 +52,7 @@ public:
BaseSubFrame(BaseGame *inGame);
virtual ~BaseSubFrame();
bool loadBuffer(byte *buffer, int lifeTime, bool keepLoaded);
- bool draw(int x, int y, BaseObject *registerOwner = NULL, float zoomX = 100, float zoomY = 100, bool precise = true, uint32 alpha = 0xFFFFFFFF, float rotate = 0.0f, TSpriteBlendMode blendMode = BLEND_NORMAL);
+ bool draw(int x, int y, BaseObject *registerOwner = nullptr, float zoomX = 100, float zoomY = 100, bool precise = true, uint32 alpha = 0xFFFFFFFF, float rotate = 0.0f, TSpriteBlendMode blendMode = BLEND_NORMAL);
bool getBoundingRect(Rect32 *rect, int x, int y, float scaleX = 100, float scaleY = 100);
const char* getSurfaceFilename();
@@ -72,7 +72,7 @@ public:
byte _cKRed;
byte _cKGreen;
byte _cKBlue;
- int _lifeTime;
+ int32 _lifeTime;
bool _keepLoaded;
bool _2DOnly;