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

Fixed shadow variable

Browse source 
svn-id: r8025
This commit is contained in:
Jamieson Christian 2003-05-26 22:19:12 +00:00
parent 0cd4e3c6c0
commit b47d76222f
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scumm/player_v2.cpp
View file

@ -537,7 +537,7 @@ void Player_V2::execute_cmd(ChannelInfo *channel) {
opcode = *script_ptr++; opcode = *script_ptr++;
note = opcode & 0x7f; note = opcode & 0x7f;
if (note != 0x7f) { if (note != 0x7f) {
uint16 freq; uint16 myfreq;
dest_channel->d.time_left = channel->d.time_left; dest_channel->d.time_left = channel->d.time_left;
dest_channel->d.note_length = dest_channel->d.note_length =
channel->d.time_left - dest_channel->d.inter_note_pause; channel->d.time_left - dest_channel->d.inter_note_pause;
@ -550,11 +550,11 @@ void Player_V2::execute_cmd(ChannelInfo *channel) {
dest_channel->d.hull_counter = 1; dest_channel->d.hull_counter = 1;
if (pcjr && dest_channel == &channels[3]) { if (pcjr && dest_channel == &channels[3]) {
dest_channel->d.hull_curve = 180 + note * 12; dest_channel->d.hull_curve = 180 + note * 12;
freq = 384 - 64 * octave; myfreq = 384 - 64 * octave;
} else { } else {
freq = freqs_table[note] >> octave; myfreq = freqs_table[note] >> octave;
} }
dest_channel->d.freq = dest_channel->d.base_freq = freq; dest_channel->d.freq = dest_channel->d.base_freq = myfreq;
} }
if ((opcode & 0x80) != 0) if ((opcode & 0x80) != 0)
goto end; goto end;