[Scummvm-cvs-logs] scummvm master -> ba17ed94903d183b7f1810179db01ffb40bd530d

somaen einarjohants at gmail.com
Mon Oct 28 18:38:53 CET 2013


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
889c3c9801 WINTERMUTE: Deconstify UIObject::getHeight() to fix a shadowed overload.
ba17ed9490 WINTERMUTE: Change BaseObject::getHeight() to return int32 instead of int.


Commit: 889c3c9801e714f7c2de7a73cc877835a0b1fed5
    https://github.com/scummvm/scummvm/commit/889c3c9801e714f7c2de7a73cc877835a0b1fed5
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-10-28T10:37:20-07:00

Commit Message:
WINTERMUTE: Deconstify UIObject::getHeight() to fix a shadowed overload.

Changed paths:
    engines/wintermute/ui/ui_object.cpp
    engines/wintermute/ui/ui_object.h



diff --git a/engines/wintermute/ui/ui_object.cpp b/engines/wintermute/ui/ui_object.cpp
index a8da89b..fbe18ef 100644
--- a/engines/wintermute/ui/ui_object.cpp
+++ b/engines/wintermute/ui/ui_object.cpp
@@ -652,7 +652,10 @@ int32 UIObject::getWidth() const {
 	return _width;
 }
 
-int32 UIObject::getHeight() const {
+// Has to be non-const to allow the virtual override to work,
+// as other getHeight()-functions currently have the potential
+// of having side-effects.
+int32 UIObject::getHeight() {
 	return _height;
 }
 
diff --git a/engines/wintermute/ui/ui_object.h b/engines/wintermute/ui/ui_object.h
index 8d14d8a..ecbaebc 100644
--- a/engines/wintermute/ui/ui_object.h
+++ b/engines/wintermute/ui/ui_object.h
@@ -69,7 +69,7 @@ public:
 	TUIObjectType _type;
 
 	int32 getWidth() const;
-	int32 getHeight() const;
+	int32 getHeight() override;
 	void setHeight(int32 height);
 	void setWidth(int32 width);
 	bool isDisabled() const;


Commit: ba17ed94903d183b7f1810179db01ffb40bd530d
    https://github.com/scummvm/scummvm/commit/ba17ed94903d183b7f1810179db01ffb40bd530d
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-10-28T10:38:17-07:00

Commit Message:
WINTERMUTE: Change BaseObject::getHeight() to return int32 instead of int.

Changed paths:
    engines/wintermute/ad/ad_actor.cpp
    engines/wintermute/ad/ad_actor.h
    engines/wintermute/ad/ad_entity.cpp
    engines/wintermute/ad/ad_entity.h
    engines/wintermute/ad/ad_object.cpp
    engines/wintermute/ad/ad_object.h
    engines/wintermute/base/base_object.cpp
    engines/wintermute/base/base_object.h



diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index 967270b..3212388 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -1376,7 +1376,7 @@ TDirection AdActor::angleToDirection(int angle) {
 
 
 //////////////////////////////////////////////////////////////////////////
-int AdActor::getHeight() {
+int32 AdActor::getHeight() {
 	// if no current sprite is set, set some
 	if (_currentSprite == nullptr) {
 		if (_standSprite) {
diff --git a/engines/wintermute/ad/ad_actor.h b/engines/wintermute/ad/ad_actor.h
index e836dd7..3225eb4 100644
--- a/engines/wintermute/ad/ad_actor.h
+++ b/engines/wintermute/ad/ad_actor.h
@@ -47,7 +47,7 @@ class AdActor : public AdTalkHolder {
 public:
 	TDirection angleToDirection(int angle);
 	DECLARE_PERSISTENT(AdActor, AdTalkHolder)
-	virtual int getHeight();
+	virtual int32 getHeight() override;
 	BaseSprite *getTalkStance(const char *stance);
 	virtual void goTo(int x, int y, TDirection afterWalkDir = DI_NONE);
 	BasePoint *_targetPoint;
diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index 2c0e13a..e7471a4 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -1067,7 +1067,7 @@ bool AdEntity::saveAsText(BaseDynamicBuffer *buffer, int indent) {
 
 
 //////////////////////////////////////////////////////////////////////////
-int AdEntity::getHeight() {
+int32 AdEntity::getHeight() {
 	if (_region && !_sprite) {
 		return _region->_rect.bottom - _region->_rect.top;
 	} else {
diff --git a/engines/wintermute/ad/ad_entity.h b/engines/wintermute/ad/ad_entity.h
index c4d60e8..c3ed562 100644
--- a/engines/wintermute/ad/ad_entity.h
+++ b/engines/wintermute/ad/ad_entity.h
@@ -40,7 +40,7 @@ public:
 	void setItem(const char *itemName);
 	DECLARE_PERSISTENT(AdEntity, AdTalkHolder)
 	void updatePosition();
-	virtual int getHeight();
+	virtual int32 getHeight() override;
 	BaseRegion *_region;
 	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent) override;
 	virtual bool update();
diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp
index 0d5011f..349181b 100644
--- a/engines/wintermute/ad/ad_object.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -859,7 +859,7 @@ bool AdObject::setFont(const char *filename) {
 
 
 //////////////////////////////////////////////////////////////////////////
-int AdObject::getHeight() {
+int32 AdObject::getHeight() {
 	if (!_currentSprite) {
 		return 0;
 	} else {
diff --git a/engines/wintermute/ad/ad_object.h b/engines/wintermute/ad/ad_object.h
index 9e30f69..ba984ef 100644
--- a/engines/wintermute/ad/ad_object.h
+++ b/engines/wintermute/ad/ad_object.h
@@ -61,7 +61,7 @@ public:
 	bool reset();
 	DECLARE_PERSISTENT(AdObject, BaseObject)
 	virtual void talk(const char *text, const char *sound = nullptr, uint32 duration = 0, const char *stances = nullptr, TTextAlign align = TAL_CENTER);
-	virtual int getHeight() override;
+	virtual int32 getHeight() override;
 
 	bool setFont(const char *filename);
 	virtual bool update() override;
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp
index ea754f8..f9cedbd 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 42041c5..a190b1b 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();






More information about the Scummvm-git-logs mailing list