dominus

Untitled

Feb 5th, 2021
841
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/gamemgr/sigame.cc b/gamemgr/sigame.cc
  2. index fc2bca22..f4e59cb1 100644
  3. --- a/gamemgr/sigame.cc
  4. +++ b/gamemgr/sigame.cc
  5. @@ -44,6 +44,7 @@
  6.  #include "array_size.h"
  7.  #include "exult.h"
  8.  #include "touchui.h"
  9. +#include "Configuration.h"
  10.  
  11.  using std::cout;
  12.  using std::endl;
  13. @@ -256,6 +257,8 @@ void SI_Game::play_intro() {
  14.     bool speech = audio->is_audio_enabled() &&
  15.                   audio->is_speech_enabled();
  16.     bool speech_n_subs = Audio::get_ptr()->is_speech_with_subs();
  17. +   bool si_extended;
  18. +   config->value("config/gameplay/si_extended", si_extended);
  19.  
  20.     gwin->clear_screen(true);
  21.  
  22. @@ -290,10 +293,9 @@ void SI_Game::play_intro() {
  23.  
  24.         // Castle Outside
  25.  
  26. -#if 0
  27.         // Start Music
  28. -       audio->start_music(R_SINTRO, 0, false);
  29. -#endif
  30. +       if (!si_extended)
  31. +           audio->start_music(R_SINTRO, 0, false);
  32.  
  33.         size_t  size;
  34.         unique_ptr<unsigned char[]> buffer;
  35. @@ -304,11 +306,12 @@ void SI_Game::play_intro() {
  36.             audio->copy_and_play(buffer.get() + 8, size - 8, false);
  37.         }
  38.  
  39. -#if 0
  40. -       playfli fli1(INTRO_DAT, PATCH_INTRO, 1);
  41. -#else
  42. -       playfli fli1(BUNDLE_EXULT_SI_FLX, EXULT_SI_FLX, EXULT_SI_FLX_EXT_INTRO_CASTLE_FLC);
  43. -#endif
  44. +       if (!si_extended)
  45. +           playfli fli1(INTRO_DAT, PATCH_INTRO, 1);
  46. +       else
  47. +           playfli fli1(BUNDLE_EXULT_SI_FLX, EXULT_SI_FLX, EXULT_SI_FLX_EXT_INTRO_CASTLE_FLC);
  48. +      
  49. +
  50.         fli1.info();
  51.  
  52.         fli1.play(win, 0, 1, 0, 0);
  53. @@ -331,18 +334,17 @@ void SI_Game::play_intro() {
  54.  
  55.         }
  56.  
  57. -#if 0
  58. -       for (int j = 0; j < 50; j++) {
  59. -           num = get_frame();
  60. +       if (!si_extended) {
  61. +           for (int j = 0; j < 50; j++) {
  62. +               num = get_frame();
  63.             if (prev != num)
  64.                 for (int i = 0; i < num + 1; i++)
  65.                     fli1.play(win, i, i, next);
  66. -#else
  67. -       for (int j = 0; j < 25; j++) {
  68. +       } else{
  69. +           for (int j = 0; j < 25; j++) {
  70.                     num = get_frame();
  71. -           next = fli1.play(win, j, j, next) + 30;
  72. -#endif
  73. -
  74. +                   next = fli1.play(win, j, j, next) + 30;
  75. +       }
  76.             if (jive)
  77.                 sifont->center_text(ibuf, centerx, centery + 50, get_text_msg(dick_castle));
  78.             else
  79. @@ -354,7 +356,7 @@ void SI_Game::play_intro() {
  80.             if (wait_delay(1, 0, 1))
  81.                 throw UserBreakException();
  82.  
  83. -       }
  84. +           }
  85.  
  86.         for (int j = 0; j < 10; j++) {
  87.             num = get_frame();
  88.  
RAW Paste Data