fix speedlines never being unhidden
This commit is contained in:
		
							parent
							
								
									aa790dbc4b
								
							
						
					
					
						commit
						f1aa57b125
					
				@ -260,6 +260,7 @@ void CharLayer::start_playback(QString p_image)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void AOLayer::start_playback(QString p_image)
 | 
					void AOLayer::start_playback(QString p_image)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					  this->show();
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
  if (!ao_app->is_continuous_enabled()) {
 | 
					  if (!ao_app->is_continuous_enabled()) {
 | 
				
			||||||
    continuous = false;
 | 
					    continuous = false;
 | 
				
			||||||
@ -321,7 +322,6 @@ void AOLayer::start_playback(QString p_image)
 | 
				
			|||||||
  int f_delay = m_reader.nextImageDelay();
 | 
					  int f_delay = m_reader.nextImageDelay();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  this->set_frame(f_pixmap);
 | 
					  this->set_frame(f_pixmap);
 | 
				
			||||||
  this->show();
 | 
					 | 
				
			||||||
  if (max_frames > 1) {
 | 
					  if (max_frames > 1) {
 | 
				
			||||||
    movie_frames.append(f_pixmap);
 | 
					    movie_frames.append(f_pixmap);
 | 
				
			||||||
    movie_delays.append(f_delay);
 | 
					    movie_delays.append(f_delay);
 | 
				
			||||||
 | 
				
			|||||||
@ -1248,7 +1248,7 @@ void Courtroom::set_background(QString p_background, bool display)
 | 
				
			|||||||
  set_pos_dropdown(pos_list);
 | 
					  set_pos_dropdown(pos_list);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if (display) {
 | 
					  if (display) {
 | 
				
			||||||
    ui_vp_speedlines->stop();
 | 
					    ui_vp_speedlines->hide();
 | 
				
			||||||
    ui_vp_player_char->stop();
 | 
					    ui_vp_player_char->stop();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ui_vp_sideplayer_char->stop();
 | 
					    ui_vp_sideplayer_char->stop();
 | 
				
			||||||
@ -2218,7 +2218,7 @@ void Courtroom::effect_done()
 | 
				
			|||||||
void Courtroom::display_character()
 | 
					void Courtroom::display_character()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  // Stop all previously playing animations, effects etc.
 | 
					  // Stop all previously playing animations, effects etc.
 | 
				
			||||||
  ui_vp_speedlines->stop();
 | 
					  ui_vp_speedlines->hide();
 | 
				
			||||||
  ui_vp_player_char->stop();
 | 
					  ui_vp_player_char->stop();
 | 
				
			||||||
  ui_vp_effect->stop();
 | 
					  ui_vp_effect->stop();
 | 
				
			||||||
  // Clear all looping sfx to prevent obnoxiousness
 | 
					  // Clear all looping sfx to prevent obnoxiousness
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user