diff options
| author | Paul Gilbert | 2016-04-07 19:14:25 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-04-07 19:14:25 -0400 |
| commit | 31934ac4ba62546d66e565e6caa0da0caa666d23 (patch) | |
| tree | 7e087f38dac878b72e283da2b6add12530a9aafc /engines/titanic/core | |
| parent | cdfd9f3703050a36e16455f4bf8c343b36dd4b39 (diff) | |
| download | scummvm-rg350-31934ac4ba62546d66e565e6caa0da0caa666d23.tar.gz scummvm-rg350-31934ac4ba62546d66e565e6caa0da0caa666d23.tar.bz2 scummvm-rg350-31934ac4ba62546d66e565e6caa0da0caa666d23.zip | |
TITANIC: Fleshed out CCDROMTray class
Diffstat (limited to 'engines/titanic/core')
| -rw-r--r-- | engines/titanic/core/game_object.cpp | 6 | ||||
| -rw-r--r-- | engines/titanic/core/game_object.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index 2bac988b31..0570008a09 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -410,15 +410,15 @@ int CGameObject::getSurface45() const { return _surface ? _surface->proc45() : 0; } -void CGameObject::calcProximity(const CString &name, int val2, int val3, int val4) { +void CGameObject::soundProximity(const CString &name, int val2, int val3, int val4) { CProximity prox; prox._field8 = val2; prox._fieldC = val3; prox._field20 = val4; - calcProximity(name, prox); + soundProximity(name, prox); } -void CGameObject::calcProximity(const CString &name, CProximity &prox) { +void CGameObject::soundProximity(const CString &name, CProximity &prox) { if (prox._field28 == 2) { // TODO } diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index 7391a6b079..72192425f4 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -56,7 +56,6 @@ private: void loadImage(const CString &name, bool pendingFlag = true); void processClipList2(); - void calcProximity(const CString &name, CProximity &obj6C); protected: Rect _bounds; double _field34; @@ -181,7 +180,8 @@ public: */ void loadFrame(int frameNumber); - void calcProximity(const CString &name, int val2, int val3, int val4); + void soundProximity(const CString &name, int val2, int val3, int val4); + void soundProximity(const CString &name, CProximity &obj6C); }; } // End of namespace Titanic |