diff options
| author | Paul Gilbert | 2017-08-20 14:31:47 -0400 |
|---|---|---|
| committer | GitHub | 2017-08-20 14:31:47 -0400 |
| commit | a32a29a80e8dfc44c5da8a2f872914710a4009ae (patch) | |
| tree | 15427ed634e960f0cb2fecf4ae70a2de12577367 /engines/titanic/star_control/star_view.cpp | |
| parent | 4ba87013a9d9d50a2866fd23aaf39e546bff9b7b (diff) | |
| parent | 312d63c3c951ed3781c4f7a1577b62cb862042b3 (diff) | |
| download | scummvm-rg350-a32a29a80e8dfc44c5da8a2f872914710a4009ae.tar.gz scummvm-rg350-a32a29a80e8dfc44c5da8a2f872914710a4009ae.tar.bz2 scummvm-rg350-a32a29a80e8dfc44c5da8a2f872914710a4009ae.zip | |
Merge pull request #995 from dafioram/star_camera_work
TITANIC: CStarCamera Refactoring and CStarCrosshairs logic fix
Diffstat (limited to 'engines/titanic/star_control/star_view.cpp')
| -rw-r--r-- | engines/titanic/star_control/star_view.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp index 9b27fa470e..578cc00898 100644 --- a/engines/titanic/star_control/star_view.cpp +++ b/engines/titanic/star_control/star_view.cpp @@ -20,13 +20,16 @@ * */ -#include "titanic/support/screen_manager.h" #include "titanic/star_control/star_view.h" +#include "titanic/star_control/camera_mover.h" +#include "titanic/star_control/fvector.h" #include "titanic/star_control/star_control.h" #include "titanic/star_control/star_field.h" +#include "titanic/star_control/error_code.h" +#include "titanic/support/screen_manager.h" +#include "titanic/support/simple_file.h" #include "titanic/core/game_object.h" #include "titanic/messages/pet_messages.h" -#include "titanic/titanic.h" namespace Titanic { @@ -427,7 +430,7 @@ void CStarView::lockStar() { void CStarView::unlockStar() { if (_starField && !_showingPhoto) { - _camera.removeMatrixRow(); + _camera.removeLockedStar(); _starField->fn8(_photoSurface); } } |