diff options
| author | Einar Johan Trøan Sømåen | 2012-07-08 23:07:18 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-08 23:07:18 +0200 |
| commit | efc26fc6fa0c2c88fc39558bc3c9524fef5974f6 (patch) | |
| tree | 66686d410fbda08693c6f082d53682b7a9e95d8b | |
| parent | dd99e2278446f047dd6678b01a98d359a8ad5f69 (diff) | |
| download | scummvm-rg350-efc26fc6fa0c2c88fc39558bc3c9524fef5974f6.tar.gz scummvm-rg350-efc26fc6fa0c2c88fc39558bc3c9524fef5974f6.tar.bz2 scummvm-rg350-efc26fc6fa0c2c88fc39558bc3c9524fef5974f6.zip | |
WINTERMUTE: Rename VarName->varName in UIEntity
| -rw-r--r-- | engines/wintermute/UI/UIEntity.cpp | 10 | ||||
| -rw-r--r-- | engines/wintermute/UI/UIEntity.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/wintermute/UI/UIEntity.cpp b/engines/wintermute/UI/UIEntity.cpp index 6c63ce4897..3d00b9251c 100644 --- a/engines/wintermute/UI/UIEntity.cpp +++ b/engines/wintermute/UI/UIEntity.cpp @@ -225,23 +225,23 @@ HRESULT CUIEntity::setEntity(const char *filename) { }
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIEntity::display(int OffsetX, int OffsetY) {
+HRESULT CUIEntity::display(int offsetX, int offsetY) {
if (!_visible) return S_OK;
if (_entity) {
- _entity->_posX = OffsetX + _posX;
- _entity->_posY = OffsetY + _posY;
+ _entity->_posX = offsetX + _posX;
+ _entity->_posY = offsetY + _posY;
if (_entity->_scale < 0) _entity->_zoomable = false;
_entity->_shadowable = false;
_entity->update();
- bool OrigReg = _entity->_registrable;
+ bool origReg = _entity->_registrable;
if (_entity->_registrable && _disable) _entity->_registrable = false;
_entity->display();
- _entity->_registrable = OrigReg;
+ _entity->_registrable = origReg;
}
return S_OK;
diff --git a/engines/wintermute/UI/UIEntity.h b/engines/wintermute/UI/UIEntity.h index eba931b57f..59bcc67bf3 100644 --- a/engines/wintermute/UI/UIEntity.h +++ b/engines/wintermute/UI/UIEntity.h @@ -39,10 +39,10 @@ public: CUIEntity(CBGame *inGame);
virtual ~CUIEntity();
HRESULT loadFile(const char *filename);
- HRESULT loadBuffer(byte *Buffer, bool Complete);
+ HRESULT loadBuffer(byte *buffer, bool complete);
virtual HRESULT saveAsText(CBDynBuffer *buffer, int indent);
- virtual HRESULT display(int OffsetX = 0, int OffsetY = 0);
+ virtual HRESULT display(int offsetX = 0, int offsetY = 0);
CAdEntity *_entity;
HRESULT setEntity(const char *filename);
|