[Scummvm-cvs-logs] CVS: scummvm/scumm player_v2.cpp,2.28,2.29
Jochen Hoenicke
hoenicke at users.sourceforge.net
Sat Sep 13 08:08:05 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv13505
Modified Files:
player_v2.cpp
Log Message:
Add a new hull curve entry needed by Indy3. This fixes bug #770698.
Index: player_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.cpp,v
retrieving revision 2.28
retrieving revision 2.29
diff -u -d -r2.28 -r2.29
--- player_v2.cpp 8 Sep 2003 08:54:37 -0000 2.28
+++ player_v2.cpp 13 Sep 2003 15:02:59 -0000 2.29
@@ -60,8 +60,8 @@
static const uint16 hull_offsets[] = {
0, 12, 24, 36, 48, 60,
- 72, 88, 104, 120, 136, 240,
- 152, 164
+ 72, 88, 104, 120, 136, 256,
+ 152, 164, 180
};
static const int16 hulls[] = {
@@ -69,7 +69,7 @@
3, -1, 0, 0, 0, 0, 0, 0,
0, -1, 0, 0,
// hull 1 (staccato)
- 3, -1, 0, 30, 0, -1, 0, 0,
+ 3, -1, 0, 32, 0, -1, 0, 0,
0, -1, 0, 0,
// hull 2 (legato)
3, -1, 0, 0, 0, 0, 0, 0,
@@ -81,7 +81,7 @@
3, -1, 0, 6, 0, -1, 0, 0,
0, -1, 0, 0,
// hull 5
- 3, -1, 0, 10, 0, -1, 0, 0,
+ 3, -1, 0, 16, 0, -1, 0, 0,
0, -1, 0, 0,
// hull 6
(int16) 60000, -1, -1000, 20, 0, 0, 0, 0,
@@ -105,7 +105,11 @@
20000, -1, 4000, 7, 1000, 15, 0, 0,
(int16) 35000, -1, -2000, 15, 0, -1, 0, 0,
- // hull misc = 180
+ // hull 14 == 180
+ (int16) 35000, -1, 500, 20, 0, 0, 0, 0,
+ (int16) 45000, -1, -500, 60, 0, -1, 0, 0,
+
+ // hull misc = 196
(int16) 44000, -1, -4400, 10, 0, -1, 0, 0,
0, -1, 0, 0,
@@ -121,7 +125,7 @@
(int16) 53000, -1, -1656, 32, 0, -1, 0, 0,
0, -1, 0, 0,
- // hull 11 == 240
+ // hull 11 == 256
(int16) 63000, -1, -1968, 32, 0, -1, 0, 0,
0, -1, 0, 0,
@@ -728,7 +732,7 @@
dest_channel->d.hull_offset = 0;
dest_channel->d.hull_counter = 1;
if (_pcjr && dest_channel == &_channels[3]) {
- dest_channel->d.hull_curve = 180 + note * 12;
+ dest_channel->d.hull_curve = 196 + note * 12;
myfreq = 384 - 64 * octave;
} else {
myfreq = _freqs_table[note] >> octave;
More information about the Scummvm-git-logs
mailing list