diff options
Diffstat (limited to 'engines/wintermute/base/base_region.h')
| -rw-r--r-- | engines/wintermute/base/base_region.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/wintermute/base/base_region.h b/engines/wintermute/base/base_region.h index 464f25be2f..67ca158897 100644 --- a/engines/wintermute/base/base_region.h +++ b/engines/wintermute/base/base_region.h @@ -39,10 +39,10 @@ public: void cleanup(); bool mimic(BaseRegion *region, float scale = 100.0f, int x = 0, int y = 0); bool getBoundingRect(Rect32 *rect); - bool ptInPolygon(int x, int y); + bool ptInPolygon(int32 x, int32 y); DECLARE_PERSISTENT(BaseRegion, BaseObject) bool _active; - int _editorSelectedPoint; + int32 _editorSelectedPoint; BaseRegion(BaseGame *inGame); virtual ~BaseRegion(); bool pointInRegion(int x, int y); @@ -51,18 +51,18 @@ public: bool loadBuffer(byte *buffer, bool complete = true); Rect32 _rect; BaseArray<BasePoint *> _points; - virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent) { return saveAsText(buffer, indent, NULL); } + virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent) { return saveAsText(buffer, indent, nullptr); } virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent, const char *nameOverride); // scripting interface - virtual ScValue *scGetProperty(const Common::String &name); - virtual bool scSetProperty(const char *name, ScValue *value); - virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name); - virtual const char *scToString(); + virtual ScValue *scGetProperty(const Common::String &name) override; + virtual bool scSetProperty(const char *name, ScValue *value) override; + virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override; + virtual const char *scToString() override; private: float _lastMimicScale; - int _lastMimicX; - int _lastMimicY; + int32 _lastMimicX; + int32 _lastMimicY; }; } // end of namespace Wintermute |