Ticket #8332: adlib.cpp.diff

adlib.cpp

@@ -573 +573 @@
         bool _isOpen;
         bool _game_SmallHeader;
 
+        static Common::RandomSource _rnd;
+
         FM_OPL *_opl;
         byte *_adlib_reg_cache;
         SoundMixer *_mixer;
@@ -624 +626 @@
         void struct10_init(Struct10 * s10, InstrumentExtra * ie);
         static byte struct10_ontimer(Struct10 * s10, Struct11 * s11);
         static void struct10_setup(Struct10 * s10);
-        static int random_nr(int a);
         void mc_key_on(AdlibVoice *voice, AdlibInstrument *instr, byte note, byte velocity);
 
         static void premix_proc(void *param, int16 *buf, uint len);
@@ -1234 +1235 @@
         t = s10->table_a[f];
         e = num_steps_table[lookup_table[t & 0x7F][b]];
         if (t & 0x80) {
-                e = random_nr(e);
+                e = _rnd.getRandomNumber(e);
         }
         if (e == 0)
                 e++;
@@ -1247 +1248 @@
                 t = s10->table_b[f];
                 d = lookup_volume(c, (t & 0x7F) - 31);
                 if (t & 0x80) {
-                        d = random_nr(d);
+                        d = _rnd.getRandomNumber(d);
                 }
                 if (d + g > c) {
                         h = c - g;
@@ -1309 +1310 @@
         adlib_write(channel + 0xB0, oct | 0x20);
 }
 
-int MidiDriver_ADLIB::random_nr(int a) {
-        static byte _rand_seed = 1;
-        if (_rand_seed & 1) {
-                _rand_seed >>= 1;
-                _rand_seed ^= 0xB8;
-        } else {
-                _rand_seed >>= 1;
-        }
-        return _rand_seed * a >> 8;
-}
-
 void MidiDriver_ADLIB::part_key_off(AdlibPart *part, byte note) {
         AdlibVoice *voice;
 
@@ -1568 +1558 @@
         curnote_table[chan] = code;
         adlib_playnote(chan, (int16) channel_table_2[chan] + code);
 }
+
+Common::RandomSource MidiDriver_ADLIB::_rnd;