libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-10 11:51:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Renamings for locking/unlocking markers

Browse Source
This commit is contained in:
Paul Gilbert 2017-05-31 19:00:17 -04:00
parent 29b7ada2be
commit 520ba69b24
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/titanic/core/game_object.h
View File

@ -45,7 +45,7 @@ enum RoomFlagsComparison { RFC_LOCATION = 1, RFC_CLASS_ELEVATOR = 2, RFC_TITANIA
enum StarControlAction {
STAR_SHOW = 0, STAR_HIDE, STAR_2, STAR_RESET_POS, STAR_4, STAR_5, STAR_6, STAR_FULL_SPEED,
STAR_8, STAR_TOGGLE_MODE, STAR_10, STAR_11, STAR_12, STAR_13, STAR_SET_REFERENCE, STAR_FADE_IN,
STAR_FADE_OUT, STAR_17, STAR_18, STAR_19
STAR_FADE_OUT, LOCK_STAR, UNLOCK_STAR, STAR_19
};
class CDontSaveFileItem;

4
engines/titanic/game/nav_helmet.cpp
View File

@ -115,10 +115,10 @@ bool CNavHelmet::PETStarFieldLockMsg(CPETStarFieldLockMsg *msg) {
if (_flag) {
if (msg->_value) {
playSound("a#6.wav");
starFn(STAR_17);
starFn(LOCK_STAR);
} else {
playSound("a#5.wav");
starFn(STAR_18);
starFn(UNLOCK_STAR);
}
}

8
engines/titanic/star_control/star_control.cpp
View File

@ -242,12 +242,12 @@ void CStarControl::doAction(StarControlAction action) {
_view.fn3(false);
break;
case STAR_17:
_view.fn16();
case LOCK_STAR:
_view.lockStar();
break;
case STAR_18:
_view.fn17();
case UNLOCK_STAR:
_view.unlockStar();
break;
case STAR_19:

7
engines/titanic/star_control/star_view.cpp
View File

@ -375,7 +375,7 @@ void CStarView::setHasReference() {
_field218 = true;
}
void CStarView::fn16() {
void CStarView::lockStar() {
if (_starField && !_showingPhoto) {
CSurfaceArea surfaceArea(_videoSurface);
FVector v1, v2, v3;
@ -387,16 +387,19 @@ void CStarView::fn16() {
switch (_starField->getMatchedIndex()) {
case -1:
// First star match
_camera.fn2(v1, v2, v3);
_starField->fn7();
break;
case 0:
// Second star match
_camera.fn3(&_photoViewport, v2);
_starField->fn7();
break;
case 1:
// Third star match
_camera.fn1(&_photoViewport, v2);
_starField->fn7();
break;
@ -408,7 +411,7 @@ void CStarView::fn16() {
}
}
void CStarView::fn17() {
void CStarView::unlockStar() {
if (_starField && !_showingPhoto) {
_camera.removeMatrixRow();
_starField->fn8(_photoSurface);

11
engines/titanic/star_control/star_view.h
View File

@ -158,8 +158,15 @@ public:
*/
void setHasReference();
void fn16();
void fn17();
/**
* Handles locking in a star
*/
void lockStar();
/**
* Handles unlocking a star
*/
void unlockStar();
};