aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/star_control/star_camera.cpp
diff options
context:
space:
mode:
authorDavid Fioramonti2017-08-18 04:57:14 -0700
committerDavid Fioramonti2017-08-18 17:26:05 -0700
commit1370b49b6a88e8ea533da5d62a7f37828bf2fca1 (patch)
tree02812f22be0f8e2bc3bbb5e28043e908bd44fd49 /engines/titanic/star_control/star_camera.cpp
parent524855d173699a6b56dd932a70e2d9a1e4068d8c (diff)
downloadscummvm-rg350-1370b49b6a88e8ea533da5d62a7f37828bf2fca1.tar.gz
scummvm-rg350-1370b49b6a88e8ea533da5d62a7f37828bf2fca1.tar.bz2
scummvm-rg350-1370b49b6a88e8ea533da5d62a7f37828bf2fca1.zip
TITANIC: Simplified dependencies for classes related to star_camera
This involved removing header files and forward declaring when possible. I also reorded the header include files to be local to gloabal. E.x., in the class implementation the class header file would be the first included. This is a first pass of header reduction for star_control/ files
Diffstat (limited to 'engines/titanic/star_control/star_camera.cpp')
-rw-r--r--engines/titanic/star_control/star_camera.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp
index 76302d2266..37196b28ee 100644
--- a/engines/titanic/star_control/star_camera.cpp
+++ b/engines/titanic/star_control/star_camera.cpp
@@ -21,10 +21,14 @@
*/
#include "titanic/star_control/star_camera.h"
-#include "titanic/star_control/unmarked_camera_mover.h"
-#include "titanic/star_control/marked_camera_mover.h"
+#include "titanic/star_control/camera_mover.h"
#include "titanic/star_control/daffine.h"
#include "titanic/star_control/fmatrix.h"
+#include "titanic/star_control/fpoint.h"
+#include "titanic/star_control/marked_camera_mover.h"
+#include "titanic/star_control/unmarked_camera_mover.h"
+#include "titanic/star_control/error_code.h"
+#include "titanic/support/simple_file.h"
#include "titanic/titanic.h"
namespace Titanic {
@@ -53,6 +57,10 @@ void CStarCamera::deinit() {
_newOrientation = nullptr;
}
+bool CStarCamera::isLocked() {
+ return _mover->isLocked();
+}
+
CStarCamera::~CStarCamera() {
deleteHandler();
}