[Scummvm-git-logs] scummvm master -> 952847972438c94d623b759c8f579d3603c0382e
dreammaster
dreammaster at scummvm.org
Sat Nov 12 03:15:02 CET 2016
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:
c542c2827f TITANIC: Setup room indexes for each Remote Goto glyph
9528479724 TITANIC: Fix display of remote action buttons
Commit: c542c2827f2d8dd65e12b3129cfbbf09dc48f150
https://github.com/scummvm/scummvm/commit/c542c2827f2d8dd65e12b3129cfbbf09dc48f150
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-11T21:14:17-05:00
Commit Message:
TITANIC: Setup room indexes for each Remote Goto glyph
Changed paths:
engines/titanic/pet_control/pet_remote_glyphs.cpp
engines/titanic/pet_control/pet_remote_glyphs.h
diff --git a/engines/titanic/pet_control/pet_remote_glyphs.cpp b/engines/titanic/pet_control/pet_remote_glyphs.cpp
index f7354ea..2e69ad6 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_remote_glyphs.cpp
@@ -125,22 +125,22 @@ bool CRemoteGotoGlyph::setup(CPetControl *petControl, CPetGlyphs *owner) {
setDefaults(_gfxName, petControl);
if (owner)
- _gfxElement = getElement(7);
+ _goButton = getElement(7);
return true;
}
void CRemoteGotoGlyph::draw2(CScreenManager *screenManager) {
- if (_gfxElement)
- _gfxElement->draw(screenManager);
+ if (_goButton)
+ _goButton->draw(screenManager);
}
bool CRemoteGotoGlyph::MouseButtonDownMsg(const Point &pt) {
- return _gfxElement && _gfxElement->MouseButtonDownMsg(pt);
+ return _goButton && _goButton->MouseButtonDownMsg(pt);
}
bool CRemoteGotoGlyph::MouseButtonUpMsg(const Point &pt) {
- if (!_gfxElement || !_gfxElement->MouseButtonUpMsg(pt))
+ if (!_goButton || !_goButton->MouseButtonUpMsg(pt))
return false;
CPetControl *petControl = getPetControl();
@@ -573,49 +573,49 @@ CSummonPelleratorGlyph::CSummonPelleratorGlyph() : CBasicRemoteGlyph(
/*------------------------------------------------------------------------*/
CGotoBottomOfWellGlyph::CGotoBottomOfWellGlyph() : CRemoteGotoGlyph("3PetBotOfWell",
- g_vm->_strings[GO_TO_BOTTOM_OF_WELL]) {
+ g_vm->_strings[GO_TO_BOTTOM_OF_WELL], 10) {
}
/*------------------------------------------------------------------------*/
CGotoTopOfWellGlyph::CGotoTopOfWellGlyph() : CRemoteGotoGlyph("3PetTopOfWell",
- g_vm->_strings[GO_TO_TOP_OF_WELL]) {
+ g_vm->_strings[GO_TO_TOP_OF_WELL], 32) {
}
/*------------------------------------------------------------------------*/
CGotoStateroomGlyph::CGotoStateroomGlyph() : CRemoteGotoGlyph("3PetRoom",
- g_vm->_strings[GO_TO_STATEROOM]) {
+ g_vm->_strings[GO_TO_STATEROOM], 33) {
}
/*------------------------------------------------------------------------*/
CGotoBarGlyph::CGotoBarGlyph() : CRemoteGotoGlyph("3PetBar",
- g_vm->_strings[GO_TO_BAR]) {
+ g_vm->_strings[GO_TO_BAR], 7) {
}
/*------------------------------------------------------------------------*/
CGotoPromenadeDeckGlyph::CGotoPromenadeDeckGlyph() : CRemoteGotoGlyph("3PetPromDeck",
- g_vm->_strings[GO_TO_PROMENADE_DECK]) {
+ g_vm->_strings[GO_TO_PROMENADE_DECK], 23) {
}
/*------------------------------------------------------------------------*/
CGotoArboretumGlyph::CGotoArboretumGlyph() : CRemoteGotoGlyph("3PetArboretum",
- g_vm->_strings[GO_TO_ARBORETUM]) {
+ g_vm->_strings[GO_TO_ARBORETUM], 5) {
}
/*------------------------------------------------------------------------*/
CGotoMusicRoomGlyph::CGotoMusicRoomGlyph() : CRemoteGotoGlyph("3PetMusicRoom",
- g_vm->_strings[GO_TO_MUSIC_ROOM]) {
+ g_vm->_strings[GO_TO_MUSIC_ROOM], 20) {
}
/*------------------------------------------------------------------------*/
CGotoRestaurantGlyph::CGotoRestaurantGlyph() : CRemoteGotoGlyph("3Pet1stClassRest",
- g_vm->_strings[GO_TO_1ST_CLASS_RESTAURANT]) {
+ g_vm->_strings[GO_TO_1ST_CLASS_RESTAURANT], 1) {
}
} // End of namespace Titanic
diff --git a/engines/titanic/pet_control/pet_remote_glyphs.h b/engines/titanic/pet_control/pet_remote_glyphs.h
index 83b6e16..c661a1e 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.h
+++ b/engines/titanic/pet_control/pet_remote_glyphs.h
@@ -150,13 +150,13 @@ public:
class CRemoteGotoGlyph : public CPetRemoteGlyph {
protected:
int _roomIndex;
- CPetGfxElement *_gfxElement;
+ CPetGfxElement *_goButton;
CString _gfxName, _tooltip;
public:
- CRemoteGotoGlyph() : CPetRemoteGlyph(), _gfxElement(nullptr), _roomIndex(21) {}
- CRemoteGotoGlyph(const CString &gfxName, const CString &tooltip) :
- CPetRemoteGlyph(), _gfxElement(nullptr), _roomIndex(21),
- _gfxName(gfxName), _tooltip(tooltip) {}
+ CRemoteGotoGlyph() : CPetRemoteGlyph(), _goButton(nullptr), _roomIndex(21) {}
+ CRemoteGotoGlyph(const CString &gfxName, const CString &tooltip, int roomIndex) :
+ CPetRemoteGlyph(), _gfxName(gfxName), _tooltip(tooltip), _roomIndex(roomIndex),
+ _goButton(nullptr) {}
/**
* Setup the glyph
Commit: 952847972438c94d623b759c8f579d3603c0382e
https://github.com/scummvm/scummvm/commit/952847972438c94d623b759c8f579d3603c0382e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-11T21:14:55-05:00
Commit Message:
TITANIC: Fix display of remote action buttons
Changed paths:
engines/titanic/pet_control/pet_remote.cpp
diff --git a/engines/titanic/pet_control/pet_remote.cpp b/engines/titanic/pet_control/pet_remote.cpp
index 59207f6..46af55c 100644
--- a/engines/titanic/pet_control/pet_remote.cpp
+++ b/engines/titanic/pet_control/pet_remote.cpp
@@ -118,10 +118,10 @@ bool CPetRemote::reset() {
_right.reset("PetRight", _petControl, MODE_UNSELECTED);
_top.reset("PetTopUp", _petControl, MODE_SELECTED);
_top.reset("PetTop", _petControl, MODE_UNSELECTED);
- _bottom.reset("PetBottomUp", _petControl, MODE_SELECTED);
- _bottom.reset("PetBottom", _petControl, MODE_UNSELECTED);
- _action.reset("PetActionUp", _petControl, MODE_SELECTED);
- _action.reset("PetAction", _petControl, MODE_UNSELECTED);
+ _bottom.reset("PetBottomUp", _petControl, MODE_UNSELECTED);
+ _bottom.reset("PetBottom", _petControl, MODE_SELECTED);
+ _action.reset("PetActionUp", _petControl, MODE_UNSELECTED);
+ _action.reset("PetAction", _petControl, MODE_SELECTED);
_send.reset("PetActSend0", _petControl, MODE_UNSELECTED);
_send.reset("PetActSend1", _petControl, MODE_SELECTED);
More information about the Scummvm-git-logs
mailing list