thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup / updated some comments

Browse source 
svn-id: r15524
This commit is contained in:
Max Horn 2004-10-11 22:27:26 +00:00
parent bdf66b1a07
commit 42863d5cc2
4 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scumm/actor.cpp
View file

@ -589,10 +589,9 @@ void Actor::putActor(int dstX, int dstY, byte newRoom) {
_vm->stopTalk(); _vm->stopTalk();
} }
// HACK: The green transparency of the tank in the Hall of Oddities is // WORKAROUND: The green transparency of the tank in the Hall of Oddities is
// is positioned one pixel too far to the left. This appears to be a // is positioned one pixel too far to the left. This appears to be a
// bug in the original game as well. // bug in the original game as well.
if (_vm->_gameId == GID_SAMNMAX && newRoom == 16 && number == 5 && dstX == 235 && dstY == 236) if (_vm->_gameId == GID_SAMNMAX && newRoom == 16 && number == 5 && dstX == 235 && dstY == 236)
dstX++; dstX++;
@ -1491,8 +1490,6 @@ void Actor::walkActor() {
Common::Point foundPath; Common::Point foundPath;
if (_vm->_version >= 7) { if (_vm->_version >= 7) {
// FIXME - this is kind of a hack right now but it fixes the
// walk scripts in The Dig.
if (moving & MF_FROZEN) { if (moving & MF_FROZEN) {
if (moving & MF_TURN) { if (moving & MF_TURN) {
new_dir = updateActorDirection(false); new_dir = updateActorDirection(false);

2
scumm/player_mod.cpp
View file

@ -51,7 +51,7 @@ Player_MOD::Player_MOD(ScummEngine *scumm) {
Player_MOD::~Player_MOD() { Player_MOD::~Player_MOD() {
// Detach the premix callback handler // Detach the premix callback handler
_mixer->setupPremix(0, 0); _mixer->setupPremix(0);
for (int i = 0; i < MOD_MAXCHANS; i++) { for (int i = 0; i < MOD_MAXCHANS; i++) {
if (!_channels[i].id) if (!_channels[i].id)
continue; continue;

10
scumm/player_v2.cpp
View file

@ -382,7 +382,7 @@ Player_V2::Player_V2(ScummEngine *scumm, bool pcjr) {
Player_V2::~Player_V2() { Player_V2::~Player_V2() {
mutex_up(); mutex_up();
// Detach the premix callback handler // Detach the premix callback handler
_mixer->setupPremix(0, 0); _mixer->setupPremix(0);
mutex_down(); mutex_down();
_system->deleteMutex (_mutex); _system->deleteMutex (_mutex);
} }
@ -537,10 +537,6 @@ int Player_V2::getSoundStatus(int nr) const {
} }
void Player_V2::premix_proc(void *param, int16 *buf, uint len) {
((Player_V2 *) param)->do_mix(buf, len);
}
void Player_V2::clear_channel(int i) { void Player_V2::clear_channel(int i) {
ChannelInfo *channel = &_channels[i]; ChannelInfo *channel = &_channels[i];
memset(channel, 0, sizeof(ChannelInfo)); memset(channel, 0, sizeof(ChannelInfo));
@ -796,6 +792,10 @@ void Player_V2::next_freqs(ChannelInfo *channel) {
} }
} }
void Player_V2::premix_proc(void *param, int16 *buf, uint len) {
((Player_V2 *) param)->do_mix(buf, len);
}
void Player_V2::do_mix(int16 *data, uint len) { void Player_V2::do_mix(int16 *data, uint len) {
mutex_up(); mutex_up();
uint step; uint step;

2
scumm/script_v2.cpp
View file

@ -447,7 +447,7 @@ void ScummEngine_v2::writeVar(uint var, int value) {
// script 164. Unfortunatly, when New Kid is reenabled (var[175] = 0) in // script 164. Unfortunatly, when New Kid is reenabled (var[175] = 0) in
// script 89, script 164 isn't reran to redraw it. Why? Dunno. Hack? Yes. // script 89, script 164 isn't reran to redraw it. Why? Dunno. Hack? Yes.
if ((var == 175) && (_gameId == GID_MANIAC) && (vm.slot[_currentScript].number == 89)) if ((var == 175) && (_gameId == GID_MANIAC) && (vm.slot[_currentScript].number == 89))
runScript(164, 0, 0, 0); runScript(164, 0, 0, 0);
} }
void ScummEngine_v2::getResultPosIndirect() { void ScummEngine_v2::getResultPosIndirect() {