libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 14:50:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Fix pressing buttons in Service Elevator

Browse Source
This commit is contained in:
Paul Gilbert 2016-10-29 21:48:10 -04:00
parent 2e2e0df346
commit 64e4aac26a
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/titanic/game/transport/service_elevator.cpp
View File

@ -207,10 +207,10 @@ bool CServiceElevator::ServiceElevatorFloorRequestMsg(CServiceElevatorFloorReque
if (doorbot && _v3 == 0) {
_soundHandle1 = playSound("z#415.wav", 50);
addTimer(1, 1000, 500);
_timerId = addTimer(1, 1000, 500);
} else if (doorbot && _v3 == 1) {
_soundHandle1 = playSound("z#417.wav", 50);
addTimer(1, 1000, 500);
_timerId = addTimer(1, 1000, 500);
} else if (_fieldDC == _v3) {
switch (_v3) {
case 0:
@ -226,7 +226,7 @@ bool CServiceElevator::ServiceElevatorFloorRequestMsg(CServiceElevatorFloorReque
break;
}
addTimer(1, 1000, 500);
_timerId = addTimer(1, 1000, 500);
} else {
switch (_v3) {
case 0:
@ -242,7 +242,7 @@ bool CServiceElevator::ServiceElevatorFloorRequestMsg(CServiceElevatorFloorReque
break;
}
addTimer(0, 1000, 500);
_timerId = addTimer(0, 1000, 500);
}
return true;

2
engines/titanic/sound/sound.cpp
View File

@ -57,7 +57,7 @@ void CSound::preEnterView(CViewItem *newView, bool isNewRoom) {
_soundManager.setListenerPosition(xp, yp, zp, cosVal, sinVal, 0, isNewRoom);
}
bool CSound::isActive(int handle) const {
bool CSound::isActive(int handle) {
if (handle != 0 && handle != -1)
return _soundManager.isActive(handle);

2
engines/titanic/sound/sound.h
View File

@ -115,7 +115,7 @@ public:
/**
* Returns true if a sound with the specified handle is active
*/
bool isActive(int handle) const;
bool isActive(int handle);
/**
* Sets the volume for a sound

6
engines/titanic/sound/sound_manager.cpp
View File

@ -311,7 +311,9 @@ void QSoundManager::setPolarPosition(int handle, double range, double azimuth, d
}
}
bool QSoundManager::isActive(int handle) const {
bool QSoundManager::isActive(int handle) {
resetChannel(10);
for (uint idx = 0; idx < _slots.size(); ++idx) {
if (_slots[idx]._handle == handle)
return true;
@ -320,7 +322,7 @@ bool QSoundManager::isActive(int handle) const {
return false;
}
bool QSoundManager::isActive(const CWaveFile *waveFile) const {
bool QSoundManager::isActive(const CWaveFile *waveFile) {
return _sounds.contains(waveFile);
}

8
engines/titanic/sound/sound_manager.h
View File

@ -123,12 +123,12 @@ public:
/**
* Returns true if the given sound is currently active
*/
virtual bool isActive(int handle) const = 0;
virtual bool isActive(int handle) = 0;
/**
* Returns true if the given sound is currently active
*/
virtual bool isActive(const CWaveFile *waveFile) const { return false; }
virtual bool isActive(const CWaveFile *waveFile) { return false; }
/**
* Handles regularly updating the mixer
@ -395,12 +395,12 @@ public:
/**
* Returns true if the given sound is currently active
*/
virtual bool isActive(int handle) const;
virtual bool isActive(int handle);
/**
* Returns true if the given sound is currently active
*/
virtual bool isActive(const CWaveFile *waveFile) const;
virtual bool isActive(const CWaveFile *waveFile);
/**
* Handles regularly updating the mixer