diff options
| author | Paul Gilbert | 2016-04-10 08:20:51 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-04-10 08:20:51 -0400 |
| commit | c96164dde01f6336615528d2a7c930c37c696be2 (patch) | |
| tree | d3c1b05aabb42483a61ac4efaf87862e1c97f060 /engines | |
| parent | c9f322887c257c4a1c4eb54dfc4746bf0219a6e6 (diff) | |
| download | scummvm-rg350-c96164dde01f6336615528d2a7c930c37c696be2.tar.gz scummvm-rg350-c96164dde01f6336615528d2a7c930c37c696be2.tar.bz2 scummvm-rg350-c96164dde01f6336615528d2a7c930c37c696be2.zip | |
TITANIC: Cleanup of CSTButton
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/core/game_object.h | 2 | ||||
| -rw-r--r-- | engines/titanic/gfx/st_button.cpp | 8 | ||||
| -rw-r--r-- | engines/titanic/gfx/st_button.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index 3914c54226..108650958b 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -192,7 +192,7 @@ public: void loadFrame(int frameNumber); void soundProximity(const CString &name, int val2, int val3, int val4); - void soundProximity(const CString &name, CProximity &obj6C); + void soundProximity(const CString &name, CProximity &prox); }; } // End of namespace Titanic diff --git a/engines/titanic/gfx/st_button.cpp b/engines/titanic/gfx/st_button.cpp index 154122ed60..9a395813af 100644 --- a/engines/titanic/gfx/st_button.cpp +++ b/engines/titanic/gfx/st_button.cpp @@ -36,7 +36,7 @@ CSTButton::CSTButton() : CBackground() { _fieldF0 = 0; _currentStatus = 0; _string4 = "NULL"; - _string5 = "NULL"; + _soundName = "NULL"; _buttonFrame = 0; } @@ -47,7 +47,7 @@ void CSTButton::save(SimpleFile *file, int indent) const { file->writeNumberLine(_fieldF0, indent); file->writeNumberLine(_currentStatus, indent); file->writeQuotedLine(_string4, indent); - file->writeQuotedLine(_string5, indent); + file->writeQuotedLine(_soundName, indent); file->writeNumberLine(_buttonFrame, indent); CBackground::save(file, indent); @@ -60,7 +60,7 @@ void CSTButton::load(SimpleFile *file) { _fieldF0 = file->readNumber(); _currentStatus = file->readNumber(); _string4 = file->readString(); - _string5 = file->readString(); + _soundName = file->readString(); _buttonFrame = file->readNumber() != 0; CBackground::load(file); @@ -68,7 +68,7 @@ void CSTButton::load(SimpleFile *file) { bool CSTButton::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { changeStatus(0); - // TODO: Obj6c stuff + soundProximity(_soundName, 100, 0, 0); return true; } diff --git a/engines/titanic/gfx/st_button.h b/engines/titanic/gfx/st_button.h index d3dd5c4e76..e2f9aa3ea1 100644 --- a/engines/titanic/gfx/st_button.h +++ b/engines/titanic/gfx/st_button.h @@ -40,7 +40,7 @@ private: int _fieldF0; int _currentStatus; CString _string4; - CString _string5; + CString _soundName; int _buttonFrame; public: CLASSDEF |