aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2017-06-07 22:00:22 -0400
committerPaul Gilbert2017-06-07 22:00:22 -0400
commit46f4047a1d290202b797cdf2a1090e64adb21a61 (patch)
tree1d791d6cd2def20423aedb7b9fc54c11d8ef1895 /engines
parentc105be916ed2ee5cb0207ecfa69703ea89a61655 (diff)
downloadscummvm-rg350-46f4047a1d290202b797cdf2a1090e64adb21a61.tar.gz
scummvm-rg350-46f4047a1d290202b797cdf2a1090e64adb21a61.tar.bz2
scummvm-rg350-46f4047a1d290202b797cdf2a1090e64adb21a61.zip
TITANIC: Renamings for camera mover classes
Diffstat (limited to 'engines')
-rw-r--r--engines/titanic/module.mk4
-rw-r--r--engines/titanic/star_control/marked_camera_mover.cpp (renamed from engines/titanic/star_control/star_control_sub22.cpp)8
-rw-r--r--engines/titanic/star_control/marked_camera_mover.h (renamed from engines/titanic/star_control/star_control_sub22.h)12
-rw-r--r--engines/titanic/star_control/star_camera.cpp8
-rw-r--r--engines/titanic/star_control/unmarked_camera_mover.cpp (renamed from engines/titanic/star_control/star_control_sub21.cpp)10
-rw-r--r--engines/titanic/star_control/unmarked_camera_mover.h (renamed from engines/titanic/star_control/star_control_sub21.h)12
6 files changed, 27 insertions, 27 deletions
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index d6c8396588..e3f4392d42 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -443,13 +443,12 @@ MODULE_OBJS := \
star_control/frect.o \
star_control/fvector.o \
star_control/marked_auto_mover.o \
+ star_control/marked_camera_mover.o \
star_control/matrix_transform.o \
star_control/orientation_changer.o \
star_control/star_camera.o \
star_control/star_closeup.o \
star_control/star_control_sub2.o \
- star_control/star_control_sub21.o \
- star_control/star_control_sub22.o \
star_control/star_crosshairs.o \
star_control/star_field.o \
star_control/star_markers.o \
@@ -460,6 +459,7 @@ MODULE_OBJS := \
star_control/surface_area.o \
star_control/surface_fader.o \
star_control/unmarked_auto_mover.o \
+ star_control/unmarked_camera_mover.o \
star_control/viewport.o \
support/avi_surface.o \
support/direct_draw.o \
diff --git a/engines/titanic/star_control/star_control_sub22.cpp b/engines/titanic/star_control/marked_camera_mover.cpp
index f26fbb59a8..2e3fa8f448 100644
--- a/engines/titanic/star_control/star_control_sub22.cpp
+++ b/engines/titanic/star_control/marked_camera_mover.cpp
@@ -20,16 +20,16 @@
*
*/
-#include "titanic/star_control/star_control_sub22.h"
+#include "titanic/star_control/marked_camera_mover.h"
#include "common/textconsole.h"
namespace Titanic {
-CStarControlSub22::CStarControlSub22(const CNavigationInfo *src) :
+CMarkedCameraMover::CMarkedCameraMover(const CNavigationInfo *src) :
CCameraMover(src) {
}
-void CStarControlSub22::proc8(const FVector &oldPos, const FVector &newPos,
+void CMarkedCameraMover::proc8(const FVector &oldPos, const FVector &newPos,
const FMatrix &oldOrientation, const FMatrix &newOrientation) {
if (isLocked())
decLockCount();
@@ -38,7 +38,7 @@ void CStarControlSub22::proc8(const FVector &oldPos, const FVector &newPos,
incLockCount();
}
-void CStarControlSub22::updatePosition(CErrorCode &errorCode, FVector &pos, FMatrix &orientation) {
+void CMarkedCameraMover::updatePosition(CErrorCode &errorCode, FVector &pos, FMatrix &orientation) {
if (_autoMover.isActive()) {
decLockCount();
int val = _autoMover.proc5(errorCode, pos, orientation);
diff --git a/engines/titanic/star_control/star_control_sub22.h b/engines/titanic/star_control/marked_camera_mover.h
index 91b9c4052b..7706db1098 100644
--- a/engines/titanic/star_control/star_control_sub22.h
+++ b/engines/titanic/star_control/marked_camera_mover.h
@@ -20,20 +20,20 @@
*
*/
-#ifndef TITANIC_STAR_CONTROL_SUB22_H
-#define TITANIC_STAR_CONTROL_SUB22_H
+#ifndef TITANIC_MARKED_CAMERA_MOVER_H
+#define TITANIC_MARKED_CAMERA_MOVER_H
#include "titanic/star_control/camera_mover.h"
#include "titanic/star_control/marked_auto_mover.h"
namespace Titanic {
-class CStarControlSub22 : public CCameraMover {
+class CMarkedCameraMover : public CCameraMover {
private:
CMarkedAutoMover _autoMover;
public:
- CStarControlSub22(const CNavigationInfo *src);
- virtual ~CStarControlSub22() {}
+ CMarkedCameraMover(const CNavigationInfo *src);
+ virtual ~CMarkedCameraMover() {}
virtual void proc8(const FVector &oldPos, const FVector &newPos,
const FMatrix &oldOrientation, const FMatrix &newOrientation);
@@ -46,4 +46,4 @@ public:
} // End of namespace Titanic
-#endif /* TITANIC_STAR_CONTROL_SUB22_H */
+#endif /* TITANIC_MARKED_CAMERA_MOVER_H */
diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp
index 93aee9e1cc..c715daf356 100644
--- a/engines/titanic/star_control/star_camera.cpp
+++ b/engines/titanic/star_control/star_camera.cpp
@@ -21,8 +21,8 @@
*/
#include "titanic/star_control/star_camera.h"
-#include "titanic/star_control/star_control_sub21.h"
-#include "titanic/star_control/star_control_sub22.h"
+#include "titanic/star_control/unmarked_camera_mover.h"
+#include "titanic/star_control/marked_camera_mover.h"
#include "titanic/star_control/dmatrix.h"
#include "titanic/star_control/fmatrix.h"
#include "titanic/titanic.h"
@@ -389,13 +389,13 @@ bool CStarCamera::setupHandler(const CNavigationInfo *src) {
switch (_matrixRow) {
case -1:
- mover = new CStarControlSub21(src);
+ mover = new CUnmarkedCameraMover(src);
break;
case 0:
case 1:
case 2:
- mover = new CStarControlSub22(src);
+ mover = new CMarkedCameraMover(src);
break;
default:
diff --git a/engines/titanic/star_control/star_control_sub21.cpp b/engines/titanic/star_control/unmarked_camera_mover.cpp
index 4b7a6c396b..bafab7b6a8 100644
--- a/engines/titanic/star_control/star_control_sub21.cpp
+++ b/engines/titanic/star_control/unmarked_camera_mover.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "titanic/star_control/star_control_sub21.h"
+#include "titanic/star_control/unmarked_camera_mover.h"
#include "titanic/star_control/dmatrix.h"
#include "titanic/star_control/dvector.h"
#include "titanic/titanic.h"
@@ -28,11 +28,11 @@
namespace Titanic {
-CStarControlSub21::CStarControlSub21(const CNavigationInfo *src) :
+CUnmarkedCameraMover::CUnmarkedCameraMover(const CNavigationInfo *src) :
CCameraMover(src) {
}
-void CStarControlSub21::moveTo(const FVector &srcV, const FVector &destV, const FMatrix &orientation) {
+void CUnmarkedCameraMover::moveTo(const FVector &srcV, const FVector &destV, const FMatrix &orientation) {
if (isLocked())
decLockCount();
@@ -41,7 +41,7 @@ void CStarControlSub21::moveTo(const FVector &srcV, const FVector &destV, const
_autoMover.setPath(srcV, destV, orientation);
}
-void CStarControlSub21::proc10(const FVector &v1, const FVector &v2, const FVector &v3, const FMatrix &m) {
+void CUnmarkedCameraMover::proc10(const FVector &v1, const FVector &v2, const FVector &v3, const FMatrix &m) {
if (isLocked())
decLockCount();
@@ -54,7 +54,7 @@ void CStarControlSub21::proc10(const FVector &v1, const FVector &v2, const FVect
incLockCount();
}
-void CStarControlSub21::updatePosition(CErrorCode &errorCode, FVector &pos, FMatrix &orientation) {
+void CUnmarkedCameraMover::updatePosition(CErrorCode &errorCode, FVector &pos, FMatrix &orientation) {
if (_autoMover.isActive()) {
decLockCount();
int val = _autoMover.proc5(errorCode, pos, orientation);
diff --git a/engines/titanic/star_control/star_control_sub21.h b/engines/titanic/star_control/unmarked_camera_mover.h
index bd876e5631..bcf904684f 100644
--- a/engines/titanic/star_control/star_control_sub21.h
+++ b/engines/titanic/star_control/unmarked_camera_mover.h
@@ -20,20 +20,20 @@
*
*/
-#ifndef TITANIC_STAR_CONTROL_SUB21_H
-#define TITANIC_STAR_CONTROL_SUB21_H
+#ifndef TITANIC_UNMARKED_CAMERA_MOVER_H
+#define TITANIC_UNMARKED_CAMERA_MOVER_H
#include "titanic/star_control/camera_mover.h"
#include "titanic/star_control/unmarked_auto_mover.h"
namespace Titanic {
-class CStarControlSub21 : public CCameraMover {
+class CUnmarkedCameraMover : public CCameraMover {
private:
CUnmarkedAutoMover _autoMover;
public:
- CStarControlSub21(const CNavigationInfo *src);
- virtual ~CStarControlSub21() {}
+ CUnmarkedCameraMover(const CNavigationInfo *src);
+ virtual ~CUnmarkedCameraMover() {}
/**
* Start a movement to a given specified destination
@@ -50,4 +50,4 @@ public:
} // End of namespace Titanic
-#endif /* TITANIC_STAR_CONTROL_SUB21_H */
+#endif /* TITANIC_UNMARKED_CAMERA_MOVER_H */