aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2013-10-28 18:38:17 +0100
committerEinar Johan Trøan Sømåen2013-10-28 18:38:17 +0100
commitba17ed94903d183b7f1810179db01ffb40bd530d (patch)
treea2f1476cf896c5ba575925c20e99d7f3972d9464 /engines/wintermute/base
parent889c3c9801e714f7c2de7a73cc877835a0b1fed5 (diff)
downloadscummvm-rg350-ba17ed94903d183b7f1810179db01ffb40bd530d.tar.gz
scummvm-rg350-ba17ed94903d183b7f1810179db01ffb40bd530d.tar.bz2
scummvm-rg350-ba17ed94903d183b7f1810179db01ffb40bd530d.zip
WINTERMUTE: Change BaseObject::getHeight() to return int32 instead of int.
Diffstat (limited to 'engines/wintermute/base')
-rw-r--r--engines/wintermute/base/base_object.cpp2
-rw-r--r--engines/wintermute/base/base_object.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp
index ea754f8f23..f9cedbd6b8 100644
--- a/engines/wintermute/base/base_object.cpp
+++ b/engines/wintermute/base/base_object.cpp
@@ -1039,7 +1039,7 @@ bool BaseObject::setActiveCursor(const char *filename) {
//////////////////////////////////////////////////////////////////////////
-int BaseObject::getHeight() {
+int32 BaseObject::getHeight() {
return 0;
}
diff --git a/engines/wintermute/base/base_object.h b/engines/wintermute/base/base_object.h
index 42041c5e3c..a190b1bcb4 100644
--- a/engines/wintermute/base/base_object.h
+++ b/engines/wintermute/base/base_object.h
@@ -89,7 +89,7 @@ public:
virtual bool handleMouseWheel(int delta);
virtual bool handleMouse(TMouseEvent event, TMouseButton button);
virtual bool handleKeypress(Common::Event *event, bool printable = false);
- virtual int getHeight();
+ virtual int32 getHeight();
bool setCursor(const char *filename);
bool setActiveCursor(const char *filename);
bool cleanup();