diff options
Diffstat (limited to 'engines/titanic/star_control')
-rw-r--r-- | engines/titanic/star_control/camera_auto_mover.h | 6 | ||||
-rw-r--r-- | engines/titanic/star_control/marked_auto_mover.h | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/star_closeup.cpp | 12 | ||||
-rw-r--r-- | engines/titanic/star_control/viewport.h | 14 |
4 files changed, 17 insertions, 17 deletions
diff --git a/engines/titanic/star_control/camera_auto_mover.h b/engines/titanic/star_control/camera_auto_mover.h index db57627e33..d9b2888fc8 100644 --- a/engines/titanic/star_control/camera_auto_mover.h +++ b/engines/titanic/star_control/camera_auto_mover.h @@ -62,17 +62,17 @@ public: /** * Clear src and dest orientation and set some default values for other fields - */ + */ void clear(); /** * Setup a transition to from one position to another - */ + */ void setPath(const FVector &srcV, const FVector &destV); /** * Applys speeds to the mover. More than one application is usually done for several transitions - */ + */ virtual MoverState move(CErrorCode &errorCode, FVector &pos, FMatrix &orientation) { return DONE_MOVING; } /** * Given a distance to cover, determines a bunch of speeds for a gradual transition diff --git a/engines/titanic/star_control/marked_auto_mover.h b/engines/titanic/star_control/marked_auto_mover.h index ca7fbf3b7f..d5f714b3ae 100644 --- a/engines/titanic/star_control/marked_auto_mover.h +++ b/engines/titanic/star_control/marked_auto_mover.h @@ -46,7 +46,7 @@ public: /** * Applys speeds to the mover. More than one application is usually done for several transitions - */ + */ virtual MoverState move(CErrorCode &errorCode, FVector &pos, FMatrix &orientation); }; diff --git a/engines/titanic/star_control/star_closeup.cpp b/engines/titanic/star_control/star_closeup.cpp index 6ec94bbf38..3bc3623d58 100644 --- a/engines/titanic/star_control/star_closeup.cpp +++ b/engines/titanic/star_control/star_closeup.cpp @@ -69,9 +69,9 @@ bool CStarCloseup::setup2(int val1, int val2) { const int VALUES1[] = { 0x800, 0xC00, 0x1000, 0x1400, 0x1800 }; const int VALUES2[] = { 0xF95BCD, 0xA505A0, 0xFFAD43, 0x98F4EB, 0xF3EFA5, 0, - 0xFFFFFF, 0x81EEF5, 0x5FFD3, 0x4EE4FA, 0x11C3FF, 0x28F3F4, - 0x36FCF2, 0x29F1FD, 0x29BCFD, 0x98E3F4, 0xBBF3D9, 0x8198F5, - 0x5BE4F9, 0x0D6E2, 0x74EEF6, 0x68DEF8 + 0xFFFFFF, 0x81EEF5, 0x5FFD3, 0x4EE4FA, 0x11C3FF, 0x28F3F4, + 0x36FCF2, 0x29F1FD, 0x29BCFD, 0x98E3F4, 0xBBF3D9, 0x8198F5, + 0x5BE4F9, 0x0D6E2, 0x74EEF6, 0x68DEF8 }; Entry *e = &_entries[0]; @@ -174,7 +174,7 @@ bool CStarCloseup::setup2(int val1, int val2) { e->_pixel2 = (val >> 8) & 0xff; e->_pixel3 = (val >> 16) & 0xff; e->_field8 = g_vm->getRandomNumber(3) + 3; - + e->_fieldC = g_vm->getRandomNumber(255); e->_field10 = FACTOR * (float)g_vm->getRandomNumber(15); e->_field14 = ((float)g_vm->getRandomNumber(0xfffffffe) @@ -293,7 +293,7 @@ void CStarCloseup::draw(const FPose &pose, const FVector &vector, const FVector } switch (starColor) { - case WHITE: + case WHITE: surfaceArea->setMode(SA_SOLID); surfaceArea->_pixel = MKTAG_BE(entryP->_pixel1, entryP->_pixel2, entryP->_pixel3, 0); @@ -424,7 +424,7 @@ void CStarCloseup::draw(const FPose &pose, const FVector &vector, const FVector surfaceArea->drawLine(FRect(grid1._position._x, grid1._position._y, grid2._position._x, grid2._position._y)); } - } + } break; case PINK: surfaceArea->setMode(SA_SOLID); diff --git a/engines/titanic/star_control/viewport.h b/engines/titanic/star_control/viewport.h index 082d063233..ae42e84ea4 100644 --- a/engines/titanic/star_control/viewport.h +++ b/engines/titanic/star_control/viewport.h @@ -35,7 +35,7 @@ namespace Titanic { * For starview it should be white * For skyview it should be pink */ -enum StarColor { WHITE = 0, PINK = 2 }; +enum StarColor { WHITE = 0, PINK = 2 }; /** * Implements the viewport functionality for viewing the star field in @@ -111,14 +111,14 @@ public: * The view has changed between starview and skyview * Change the enum that tracks the color of the stars * Also change the X coordinate pixel offset used for star drawing - */ + */ void changeStarColorPixel(StarMode mode, double pixelOffSet); void reposition(double factor); /** * Applys a rotation matrix to the current * orientation - */ + */ void changeOrientation(const FMatrix &matrix); FPose getPose(); @@ -148,15 +148,15 @@ public: /** * Sets the center vector y angle * The actual center y value doesn't - * change untill reset is called - */ + * change untill reset is called + */ void setCenterYAngle(double angleDegrees); /** * Sets the center vector z angle * The actual center z value doesn't - * change untill reset is called - */ + * change untill reset is called + */ void setCenterZAngle(double angleDegrees); }; |