libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-18 23:57:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Einar Johan Trøan Sømåen 2013-10-28 18:38:17 +01:00
parent 889c3c9801
commit ba17ed9490
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/wintermute/ad/ad_actor.cpp
View File

@ -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) {

2
engines/wintermute/ad/ad_actor.h
View File

@ -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;

2
engines/wintermute/ad/ad_entity.cpp
View File

@ -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 {

2
engines/wintermute/ad/ad_entity.h
View File

@ -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();

2
engines/wintermute/ad/ad_object.cpp
View File

@ -859,7 +859,7 @@ bool AdObject::setFont(const char *filename) {
//////////////////////////////////////////////////////////////////////////
int AdObject::getHeight() {
int32 AdObject::getHeight() {
if (!_currentSprite) {
return 0;
} else {

2
engines/wintermute/ad/ad_object.h
View File

@ -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;

2
engines/wintermute/base/base_object.cpp
View File

@ -1039,7 +1039,7 @@ bool BaseObject::setActiveCursor(const char *filename) {
//////////////////////////////////////////////////////////////////////////
int BaseObject::getHeight() {
int32 BaseObject::getHeight() {
return 0;
}

2
engines/wintermute/base/base_object.h
View File

@ -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();