[Scummvm-cvs-logs] CVS: scummvm/scumm player_v2.cpp,2.1,2.2
Jamieson Christian
jamieson630 at users.sourceforge.net
Mon May 26 15:20:02 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv14932/scummvm/scumm
Modified Files:
player_v2.cpp
Log Message:
Fixed shadow variable
Index: player_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.cpp,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -d -r2.1 -r2.2
--- player_v2.cpp 26 May 2003 22:03:04 -0000 2.1
+++ player_v2.cpp 26 May 2003 22:19:12 -0000 2.2
@@ -537,7 +537,7 @@
opcode = *script_ptr++;
note = opcode & 0x7f;
if (note != 0x7f) {
- uint16 freq;
+ uint16 myfreq;
dest_channel->d.time_left = channel->d.time_left;
dest_channel->d.note_length =
channel->d.time_left - dest_channel->d.inter_note_pause;
@@ -550,11 +550,11 @@
dest_channel->d.hull_counter = 1;
if (pcjr && dest_channel == &channels[3]) {
dest_channel->d.hull_curve = 180 + note * 12;
- freq = 384 - 64 * octave;
+ myfreq = 384 - 64 * octave;
} 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)
goto end;
More information about the Scummvm-git-logs
mailing list