reminiscence/reminiscence-0.1.9.nosound.patch

   1 diff -purN REminiscence-0.1.9.orig/game.cpp REminiscence-0.1.9/game.cpp
   2 --- REminiscence-0.1.9.orig/game.cpp    2010-01-13 19:55:11.318625003 +0100
   3 +++ REminiscence-0.1.9/game.cpp 2010-01-13 20:06:37.770629950 +0100
   4 @@ -47,7 +47,9 @@ void Game::run() {
   5         }
   6  #endif
   7
   8 +#ifndef NO_SDL_MIXER
   9         _mix.init();
  10 +#endif
  11
  12         playCutscene(0x40);
  13         playCutscene(0x0D);
  14 @@ -77,8 +79,9 @@ void Game::run() {
  15         }
  16
  17         _res.free_TEXT();
  18 -
  19 +#ifndef NO_SDL_MIXER
  20         _mix.free();
  21 +#endif
  22         _stub->destroy();
  23  }
  24
  25 @@ -615,17 +618,21 @@ void Game::drawStoryTexts() {
  26                         }
  27                         MixerChunk chunk;
  28                         _res.load_VCE(_textToDisplay, textSpeechSegment++, &chunk.data, &chunk.len);
  29 +#ifndef NO_SDL_MIXER
  30                         if (chunk.data) {
  31                                 _mix.play(&chunk, 32000, Mixer::MAX_VOLUME);
  32                         }
  33 +#endif
  34                         _vid.updateScreen();
  35                         while (!_stub->_pi.backspace && !_stub->_pi.quit) {
  36                                 inp_update();
  37                                 _stub->sleep(80);
  38                         }
  39 +#ifndef NO_SDL_MIXER
  40                         if (chunk.data) {
  41                                 _mix.stopAll();
  42                         }
  43 +#endif
  44                         _stub->_pi.backspace = false;
  45                         if (*str == 0) {
  46                                 break;
  47 @@ -1191,7 +1198,9 @@ void Game::playSound(uint8 sfxId, uint8
  48                         MixerChunk mc;
  49                         mc.data = sfx->data;
  50                         mc.len = sfx->len;
  51 +#ifndef NO_SDL_MIXER
  52                         _mix.play(&mc, 6000, Mixer::MAX_VOLUME >> softVol);
  53 +#endif
  54                 }
  55         } else {
  56                 // in-game music