[Scummvm-git-logs] scummvm master -> 68132bd678f1191757ef817b02d3063b072ca496
dreammaster
dreammaster at scummvm.org
Sun Nov 13 03:59:22 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
68132bd678 TITANIC: Renamings for SGT state room object fields
Commit: 68132bd678f1191757ef817b02d3063b072ca496
https://github.com/scummvm/scummvm/commit/68132bd678f1191757ef817b02d3063b072ca496
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-12T21:59:15-05:00
Commit Message:
TITANIC: Renamings for SGT state room object fields
Changed paths:
engines/titanic/game/sgt/armchair.cpp
engines/titanic/game/sgt/basin.cpp
engines/titanic/game/sgt/bedfoot.cpp
engines/titanic/game/sgt/bedhead.cpp
engines/titanic/game/sgt/chest_of_drawers.cpp
engines/titanic/game/sgt/desk.cpp
engines/titanic/game/sgt/deskchair.cpp
engines/titanic/game/sgt/drawer.cpp
engines/titanic/game/sgt/sgt_state_room.cpp
engines/titanic/game/sgt/sgt_state_room.h
engines/titanic/game/sgt/sgt_tv.cpp
engines/titanic/game/sgt/toilet.cpp
engines/titanic/game/sgt/vase.cpp
engines/titanic/game/sgt/washstand.cpp
engines/titanic/pet_control/pet_remote_glyphs.cpp
engines/titanic/pet_control/pet_remote_glyphs.h
diff --git a/engines/titanic/game/sgt/armchair.cpp b/engines/titanic/game/sgt/armchair.cpp
index f547c3e..8bd5a23 100644
--- a/engines/titanic/game/sgt/armchair.cpp
+++ b/engines/titanic/game/sgt/armchair.cpp
@@ -58,7 +58,7 @@ bool CArmchair::TurnOn(CTurnOn *msg) {
playMovie(_startFrame, _endFrame, MOVIE_GAMESTATE);
playSound("b#0.wav");
_statics->_v8 = "Open";
- _fieldE0 = 0;
+ _isClosed = false;
}
return true;
@@ -69,7 +69,7 @@ bool CArmchair::TurnOff(CTurnOff *msg) {
_statics->_v8 = "Closed";
_startFrame = 11;
_endFrame = 21;
- _fieldE0 = 1;
+ _isClosed = true;
playMovie(11, 21, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT);
playSound("b#0.wav");
}
diff --git a/engines/titanic/game/sgt/basin.cpp b/engines/titanic/game/sgt/basin.cpp
index 775c67d..a3ad505 100644
--- a/engines/titanic/game/sgt/basin.cpp
+++ b/engines/titanic/game/sgt/basin.cpp
@@ -45,7 +45,7 @@ bool CBasin::TurnOn(CTurnOn *msg) {
&& _statics->_v2 == "Closed") {
setVisible(true);
_statics->_v11 = "Open";
- _fieldE0 = 0;
+ _isClosed = false;
_startFrame = 0;
_endFrame = 6;
playMovie(0, 6, MOVIE_GAMESTATE);
@@ -58,7 +58,7 @@ bool CBasin::TurnOn(CTurnOn *msg) {
bool CBasin::TurnOff(CTurnOff *msg) {
if (_statics->_v11 == "Open") {
_statics->_v11 = "Closed";
- _fieldE0 = 1;
+ _isClosed = true;
_startFrame = 8;
_endFrame = 14;
playMovie(8, 14, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
diff --git a/engines/titanic/game/sgt/bedfoot.cpp b/engines/titanic/game/sgt/bedfoot.cpp
index ff7d645..124a7b5 100644
--- a/engines/titanic/game/sgt/bedfoot.cpp
+++ b/engines/titanic/game/sgt/bedfoot.cpp
@@ -41,7 +41,7 @@ void CBedfoot::load(SimpleFile *file) {
bool CBedfoot::TurnOn(CTurnOn *msg) {
if (_statics->_v2 == "Closed" && _statics->_v11 == "Closed") {
- _fieldE0 = 0;
+ _isClosed = false;
_startFrame = 0;
if (_statics->_v10 == "Open") {
_endFrame = 13;
@@ -55,7 +55,7 @@ bool CBedfoot::TurnOn(CTurnOn *msg) {
playMovie(_startFrame, _endFrame, MOVIE_GAMESTATE);
} else if (_statics->_v2 == "RestingUnderTV") {
- _fieldE0 = 0;
+ _isClosed = false;
_startFrame = 8;
if (_statics->_v10 == "Open") {
_statics->_v2 = "Open";
@@ -84,7 +84,7 @@ bool CBedfoot::TurnOff(CTurnOff *msg) {
}
if (_statics->_v2 == "Open" && _statics->_v1 == "Closed") {
- _fieldE0 = 0;
+ _isClosed = false;
_startFrame = 20;
if (_statics->_v4 == "Closed") {
_statics->_v2 = "Closed";
@@ -98,7 +98,7 @@ bool CBedfoot::TurnOff(CTurnOff *msg) {
playSound("b#7.wav");
} else if (_statics->_v2 == "NotOnWashstand" && _statics->_v1 == "ClosedWrong") {
- _fieldE0 = 0;
+ _isClosed = false;
_startFrame = 17;
if (_statics->_v4 == "Closed") {
diff --git a/engines/titanic/game/sgt/bedhead.cpp b/engines/titanic/game/sgt/bedhead.cpp
index 216d22e..96614ed 100644
--- a/engines/titanic/game/sgt/bedhead.cpp
+++ b/engines/titanic/game/sgt/bedhead.cpp
@@ -114,7 +114,7 @@ bool CBedhead::TurnOn(CTurnOn *msg) {
_statics->_v1 = entry._name4;
playMovie(entry._startFrame, entry._endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
playSound("b#6.wav");
- _fieldE0 = false;
+ _isClosed = false;
}
}
@@ -160,7 +160,7 @@ bool CBedhead::TurnOff(CTurnOff *msg) {
_statics->_v1 = entry._name4;
playMovie(entry._startFrame, entry._endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
playSound("193_436_bed fold up 1.wav");
- _fieldE0 = false;
+ _isClosed = false;
}
}
diff --git a/engines/titanic/game/sgt/chest_of_drawers.cpp b/engines/titanic/game/sgt/chest_of_drawers.cpp
index 2db26ad..153a358 100644
--- a/engines/titanic/game/sgt/chest_of_drawers.cpp
+++ b/engines/titanic/game/sgt/chest_of_drawers.cpp
@@ -42,7 +42,7 @@ void CChestOfDrawers::load(SimpleFile *file) {
bool CChestOfDrawers::TurnOn(CTurnOn *msg) {
if (_statics->_v6 == "Closed" && _statics->_v5 == "Open") {
- _fieldE0 = false;
+ _isClosed = false;
_statics->_v6 = "Open";
_startFrame = 1;
_endFrame = 14;
@@ -57,7 +57,7 @@ bool CChestOfDrawers::TurnOff(CTurnOff *msg) {
CVisibleMsg visibleMsg;
visibleMsg.execute("Drawer");
_statics->_v6 = "Closed";
- _fieldE0 = true;
+ _isClosed = true;
_startFrame = 14;
_endFrame = 27;
diff --git a/engines/titanic/game/sgt/desk.cpp b/engines/titanic/game/sgt/desk.cpp
index 09ff66f..941eecb 100644
--- a/engines/titanic/game/sgt/desk.cpp
+++ b/engines/titanic/game/sgt/desk.cpp
@@ -44,7 +44,7 @@ bool CDesk::TurnOn(CTurnOn *msg) {
if (_statics->_v5 == "Closed" && _statics->_v1 != "RestingG"
&& _statics->_v1 != "OpenWrong") {
_statics->_v5 = "Open";
- _fieldE0 = false;
+ _isClosed = false;
_startFrame = 1;
_endFrame = 26;
playMovie(1, 26, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
@@ -61,7 +61,7 @@ bool CDesk::TurnOff(CTurnOff *msg) {
visibleMsg.execute("ChestOfDrawers");
_statics->_v5 = "Closed";
- _fieldE0 = true;
+ _isClosed = true;
_startFrame = 26;
_endFrame = 51;
playMovie(26, 51, MOVIE_GAMESTATE);
diff --git a/engines/titanic/game/sgt/deskchair.cpp b/engines/titanic/game/sgt/deskchair.cpp
index 7f64c2e..800c355 100644
--- a/engines/titanic/game/sgt/deskchair.cpp
+++ b/engines/titanic/game/sgt/deskchair.cpp
@@ -45,7 +45,7 @@ bool CDeskchair::TurnOn(CTurnOn *msg) {
if (_statics->_v8 == "Closed" && _statics->_v9 == "Closed") {
setVisible(true);
_statics->_v9 = "Open";
- _fieldE0 = false;
+ _isClosed = false;
_startFrame = 0;
_endFrame = 16;
playMovie(0, 16, MOVIE_GAMESTATE);
@@ -58,7 +58,7 @@ bool CDeskchair::TurnOn(CTurnOn *msg) {
bool CDeskchair::TurnOff(CTurnOff *msg) {
if (_statics->_v9 == "Open") {
_statics->_v9 = "Closed";
- _fieldE0 = true;
+ _isClosed = true;
_startFrame = 16;
_endFrame = 32;
playMovie(16, 32, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
@@ -72,7 +72,7 @@ bool CDeskchair::ActMsg(CActMsg *msg) {
if (msg->_action == "Smash") {
setVisible(false);
_statics->_v9 = "Closed";
- _fieldE0 = true;
+ _isClosed = true;
loadFrame(0);
return true;
} else {
diff --git a/engines/titanic/game/sgt/drawer.cpp b/engines/titanic/game/sgt/drawer.cpp
index b8e93c3..3ce92a8 100644
--- a/engines/titanic/game/sgt/drawer.cpp
+++ b/engines/titanic/game/sgt/drawer.cpp
@@ -48,7 +48,7 @@ void CDrawer::load(SimpleFile *file) {
bool CDrawer::TurnOn(CTurnOn *msg) {
if (_statics->_v7 == "Closed" && _statics->_v6 == "Open") {
_statics->_v7 = "Open";
- _fieldE0 = false;
+ _isClosed = false;
_startFrame = 50;
_endFrame = 75;
setVisible(true);
@@ -65,7 +65,7 @@ bool CDrawer::TurnOff(CTurnOff *msg) {
_statics->_v7 = "Closed";
_startFrame = 75;
_endFrame = 100;
- _fieldE0 = true;
+ _isClosed = true;
playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
playSound("b#10.wav");
}
diff --git a/engines/titanic/game/sgt/sgt_state_room.cpp b/engines/titanic/game/sgt/sgt_state_room.cpp
index 02f1723..3408ecd 100644
--- a/engines/titanic/game/sgt/sgt_state_room.cpp
+++ b/engines/titanic/game/sgt/sgt_state_room.cpp
@@ -43,7 +43,7 @@ void CSGTStateRoom::deinit() {
delete _statics;
}
-CSGTStateRoom::CSGTStateRoom() : CBackground(), _fieldE0(1),
+CSGTStateRoom::CSGTStateRoom() : CBackground(), _isClosed(1),
_fieldE4(1), _fieldE8(0), _fieldEC(1), _fieldF0(1) {
}
@@ -62,7 +62,7 @@ void CSGTStateRoom::save(SimpleFile *file, int indent) {
file->writeQuotedLine(_statics->_v11, indent);
file->writeQuotedLine(_statics->_v12, indent);
- file->writeNumberLine(_fieldE0, indent);
+ file->writeNumberLine(_isClosed, indent);
file->writeNumberLine(_fieldE4, indent);
file->writeNumberLine(_statics->_v13, indent);
file->writeNumberLine(_statics->_v14, indent);
@@ -88,7 +88,7 @@ void CSGTStateRoom::load(SimpleFile *file) {
_statics->_v11 = file->readString();
_statics->_v12 = file->readString();
- _fieldE0 = file->readNumber();
+ _isClosed = file->readNumber();
_fieldE4 = file->readNumber();
_statics->_v13 = file->readNumber();
_statics->_v14 = file->readNumber();
@@ -106,7 +106,7 @@ bool CSGTStateRoom::ActMsg(CActMsg *msg) {
if (roomFlags != assignedRoom) {
petDisplayMessage(NOT_YOUR_ASSIGNED_ROOM);
- } else if (_fieldE0) {
+ } else if (_isClosed) {
CTurnOn onMsg;
onMsg.execute(this);
} else {
@@ -129,7 +129,7 @@ bool CSGTStateRoom::EnterRoomMsg(CEnterRoomMsg *msg) {
if (roomFlags == assignedRoom) {
loadFrame(_fieldE8);
- _fieldE0 = _fieldEC;
+ _isClosed = _fieldEC;
setVisible(_fieldF0);
if (isEquals("Desk") && _statics->_v5 == "Closed")
@@ -146,7 +146,7 @@ bool CSGTStateRoom::EnterRoomMsg(CEnterRoomMsg *msg) {
_statics->_v7 = "Closed";
setVisible(false);
- _fieldE0 = true;
+ _isClosed = true;
} else if (roomFlags != assignedRoom) {
loadFrame(0);
if (_fieldE4) {
@@ -168,7 +168,7 @@ bool CSGTStateRoom::LeaveRoomMsg(CLeaveRoomMsg *msg) {
if (roomFlags == assignedRoom) {
_fieldE8 = getMovieFrame();
- _fieldEC = _fieldE0;
+ _fieldEC = _isClosed;
_fieldF0 = _visible;
}
diff --git a/engines/titanic/game/sgt/sgt_state_room.h b/engines/titanic/game/sgt/sgt_state_room.h
index 3975f7b..6703ef6 100644
--- a/engines/titanic/game/sgt/sgt_state_room.h
+++ b/engines/titanic/game/sgt/sgt_state_room.h
@@ -54,7 +54,7 @@ class CSGTStateRoom : public CBackground {
protected:
static CSGTStateRoomStatics *_statics;
protected:
- bool _fieldE0;
+ bool _isClosed;
int _fieldE4;
int _fieldE8;
bool _fieldEC;
diff --git a/engines/titanic/game/sgt/sgt_tv.cpp b/engines/titanic/game/sgt/sgt_tv.cpp
index 08ed381..1730373 100644
--- a/engines/titanic/game/sgt/sgt_tv.cpp
+++ b/engines/titanic/game/sgt/sgt_tv.cpp
@@ -43,7 +43,7 @@ void CSGTTV::load(SimpleFile *file) {
bool CSGTTV::TurnOff(CTurnOff *msg) {
if (CSGTStateRoom::_statics->_v4 == "Open") {
CSGTStateRoom::_statics->_v4 = "Closed";
- _fieldE0 = true;
+ _isClosed = true;
_startFrame = 6;
_endFrame = 12;
playMovie(6, 12, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
@@ -57,7 +57,7 @@ bool CSGTTV::TurnOn(CTurnOn *msg) {
CSGTStateRoom::_statics->_v2 == "Closed") {
CSGTStateRoom::_statics->_v4 = "Open";
setVisible(true);
- _fieldE0 = false;
+ _isClosed = false;
_startFrame = 1;
_endFrame = 6;
playMovie(1, 6, MOVIE_GAMESTATE);
diff --git a/engines/titanic/game/sgt/toilet.cpp b/engines/titanic/game/sgt/toilet.cpp
index b8e87b6..d323202 100644
--- a/engines/titanic/game/sgt/toilet.cpp
+++ b/engines/titanic/game/sgt/toilet.cpp
@@ -47,7 +47,7 @@ bool CToilet::TurnOn(CTurnOn *msg) {
setVisible(true);
CSGTStateRoom::_statics->_v12 = "Open";
- _fieldE0 = false;
+ _isClosed = false;
_startFrame = 0;
_endFrame = 11;
playMovie(0, 11, MOVIE_GAMESTATE);
@@ -61,7 +61,7 @@ bool CToilet::TurnOff(CTurnOff *msg) {
if (CSGTStateRoom::_statics->_v12 == "Open") {
CSGTStateRoom::_statics->_v12 = "Closed";
- _fieldE0 = true;
+ _isClosed = true;
_startFrame = 11;
_endFrame = 18;
playMovie(11, 18, MOVIE_GAMESTATE);
diff --git a/engines/titanic/game/sgt/vase.cpp b/engines/titanic/game/sgt/vase.cpp
index 2d37818..e978828 100644
--- a/engines/titanic/game/sgt/vase.cpp
+++ b/engines/titanic/game/sgt/vase.cpp
@@ -44,7 +44,7 @@ bool CVase::TurnOn(CTurnOn *msg) {
if (CSGTStateRoom::_statics->_v3 == "Closed") {
CSGTStateRoom::_statics->_v3 = "Open";
setVisible(true);
- _fieldE0 = false;
+ _isClosed = false;
_startFrame = 1;
_endFrame = 12;
playMovie(1, 12, MOVIE_GAMESTATE);
@@ -58,7 +58,7 @@ bool CVase::TurnOff(CTurnOff *msg) {
&& CSGTStateRoom::_statics->_v1 != "RestingV"
&& CSGTStateRoom::_statics->_v1 != "RestingUV") {
CSGTStateRoom::_statics->_v3 = "Closed";
- _fieldE0 = true;
+ _isClosed = true;
_startFrame = 12;
_endFrame = 25;
playMovie(12, 25, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
diff --git a/engines/titanic/game/sgt/washstand.cpp b/engines/titanic/game/sgt/washstand.cpp
index afdc744..50187d2 100644
--- a/engines/titanic/game/sgt/washstand.cpp
+++ b/engines/titanic/game/sgt/washstand.cpp
@@ -44,7 +44,7 @@ bool CWashstand::TurnOn(CTurnOn *msg) {
if (_statics->_v10 == "Closed" && _statics->_v2 == "NotOnWashstand") {
setVisible(true);
_statics->_v10 = "Open";
- _fieldE0 = false;
+ _isClosed = false;
_startFrame = 0;
_endFrame = 14;
playMovie(0, 14, MOVIE_GAMESTATE);
@@ -58,7 +58,7 @@ bool CWashstand::TurnOff(CTurnOff *msg) {
if (_statics->_v10 == "Open" && _statics->_v11 == "Closed"
&& _statics->_v12 == "Closed" && _statics->_v2 == "Open") {
_statics->_v10 = "Closed";
- _fieldE0 = true;
+ _isClosed = true;
_startFrame = 14;
_endFrame = 28;
playMovie(14, 28, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT);
diff --git a/engines/titanic/pet_control/pet_remote_glyphs.cpp b/engines/titanic/pet_control/pet_remote_glyphs.cpp
index 2e69ad6..8125782 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_remote_glyphs.cpp
@@ -90,29 +90,29 @@ void CBasicRemoteGlyph::getTooltip(CPetText *text) {
bool CToggleRemoteGlyph::setup(CPetControl *petControl, CPetGlyphs *owner) {
CPetGlyph::setup(petControl, owner);
if (owner)
- _gfxElement = getElement(0);
+ _toggle = getElement(0);
return true;
}
void CToggleRemoteGlyph::draw2(CScreenManager *screenManager) {
- _gfxElement->setMode(_flag ? MODE_SELECTED : MODE_UNSELECTED);
- _gfxElement->draw(screenManager);
+ _toggle->setMode(_toggleFlag ? MODE_SELECTED : MODE_UNSELECTED);
+ _toggle->draw(screenManager);
}
bool CToggleRemoteGlyph::elementMouseButtonDownMsg(const Point &pt, int petNum) {
- return _gfxElement->MouseButtonDownMsg(pt);
+ return _toggle->MouseButtonDownMsg(pt);
}
bool CToggleRemoteGlyph::elementMouseButtonUpMsg(const Point &pt, int petNum) {
- if (!_gfxElement->MouseButtonUpMsg(pt))
+ if (!_toggle->MouseButtonUpMsg(pt))
return false;
CTreeItem *target = getPetControl()->_remoteTarget;
if (target) {
CPETActivateMsg msg("SGTSelector", petNum);
msg.execute(target);
- _flag = !_flag;
- _gfxElement->setMode(_flag ? MODE_SELECTED : MODE_UNSELECTED);
+ _toggleFlag = !_toggleFlag;
+ _toggle->setMode(_toggleFlag ? MODE_SELECTED : MODE_UNSELECTED);
}
return true;
@@ -223,10 +223,11 @@ void CTelevisionControlGlyph::getTooltip(CPetText *text) {
/*------------------------------------------------------------------------*/
bool CEntertainmentDeviceGlyph::setup(CPetControl *petControl, CPetGlyphs *owner) {
- CPetRemoteGlyph::setup(petControl, owner);
+ CToggleRemoteGlyph::setup(petControl, owner);
+ setDefaults("3PetSGTtv", petControl);
if (owner) {
- _gfxElement2 = getElement(1);
- _gfxElement3 = getElement(2);
+ _up = getElement(1);
+ _down = getElement(2);
}
return true;
@@ -235,13 +236,13 @@ bool CEntertainmentDeviceGlyph::setup(CPetControl *petControl, CPetGlyphs *owner
void CEntertainmentDeviceGlyph::draw2(CScreenManager *screenManager) {
CString viewName = getPetControl()->getFullViewName();
if (viewName == "SGTState.Node 1.S") {
- _gfxElement->setSelected(_flag);
- _gfxElement->draw(screenManager);
+ _toggle->setSelected(_toggleFlag);
+ _toggle->draw(screenManager);
} else if (viewName == "SGTState.Node 4.E") {
- _gfxElement->setSelected(_flag2);
- _gfxElement->draw(screenManager);
- _gfxElement2->draw(screenManager);
- _gfxElement3->draw(screenManager);
+ _toggle->setSelected(_flag2);
+ _toggle->draw(screenManager);
+ _up->draw(screenManager);
+ _down->draw(screenManager);
}
}
@@ -250,9 +251,9 @@ bool CEntertainmentDeviceGlyph::MouseButtonDownMsg(const Point &pt) {
if (viewName == "SGTState.Node 1.S") {
return elementMouseButtonDownMsg(pt, 4);
} else if (viewName == "SGTState.Node 4.E") {
- return _gfxElement->MouseButtonDownMsg(pt)
- || _gfxElement2->MouseButtonDownMsg(pt)
- || _gfxElement3->MouseButtonDownMsg(pt);
+ return _toggle->MouseButtonDownMsg(pt)
+ || _up->MouseButtonDownMsg(pt)
+ || _down->MouseButtonDownMsg(pt);
}
return false;
@@ -263,15 +264,14 @@ bool CEntertainmentDeviceGlyph::MouseButtonUpMsg(const Point &pt) {
if (viewName == "SGTState.Node 1.S") {
return elementMouseButtonUpMsg(pt, 4);
} else if (viewName == "SGTState.Node 4.E") {
- if (_gfxElement->MouseButtonUpMsg(pt)) {
+ if (_toggle->MouseButtonUpMsg(pt)) {
_flag2 = !_flag2;
getOwner()->generateMessage(RMSG_ACTIVATE, "Television");
return true;
- } else if (_gfxElement2->MouseButtonUpMsg(pt)) {
+ } else if (_up->MouseButtonUpMsg(pt)) {
getOwner()->generateMessage(RMSG_UP, "Television");
return true;
- }
- else if (_gfxElement3->MouseButtonUpMsg(pt)) {
+ } else if (_down->MouseButtonUpMsg(pt)) {
getOwner()->generateMessage(RMSG_DOWN, "Television");
return true;
}
diff --git a/engines/titanic/pet_control/pet_remote_glyphs.h b/engines/titanic/pet_control/pet_remote_glyphs.h
index c661a1e..d0edd6f 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.h
+++ b/engines/titanic/pet_control/pet_remote_glyphs.h
@@ -121,10 +121,10 @@ public:
class CToggleRemoteGlyph : public CPetRemoteGlyph {
protected:
- CPetGfxElement *_gfxElement;
- bool _flag;
+ CPetGfxElement *_toggle;
+ bool _toggleFlag;
public:
- CToggleRemoteGlyph() : CPetRemoteGlyph(), _gfxElement(nullptr), _flag(false) {}
+ CToggleRemoteGlyph() : CPetRemoteGlyph(), _toggle(nullptr), _toggleFlag(false) {}
/**
* Setup the glyph
@@ -231,10 +231,10 @@ public:
class CEntertainmentDeviceGlyph : public CToggleRemoteGlyph {
public:
bool _flag2;
- CPetGfxElement *_gfxElement2, *_gfxElement3;
+ CPetGfxElement *_up, *_down;
public:
CEntertainmentDeviceGlyph() : CToggleRemoteGlyph(),
- _flag2(false), _gfxElement2(nullptr), _gfxElement3(nullptr) {}
+ _flag2(false), _up(nullptr), _down(nullptr) {}
/**
* Setup the glyph
More information about the Scummvm-git-logs
mailing list