Fix blankposting when narrating not hiding the chatbox
Fix using objections against talking players not causing them to stop talking (with this method, they will only finish their current animation cycle unitl freezing in place)
This commit is contained in:
		
							parent
							
								
									1edb5d9ae1
								
							
						
					
					
						commit
						a1abe8abfa
					
				@ -2229,6 +2229,7 @@ bool Courtroom::handle_objection()
 | 
			
		||||
        filename, m_chatmessage[CHAR_NAME],
 | 
			
		||||
        ao_app->get_chat(m_chatmessage[CHAR_NAME]));
 | 
			
		||||
    sfx_player->clear(); // Objection played! Cut all sfx.
 | 
			
		||||
    ui_vp_player_char->set_play_once(true);
 | 
			
		||||
    return true;
 | 
			
		||||
  }
 | 
			
		||||
  if (m_chatmessage[EMOTE] != "")
 | 
			
		||||
@ -3253,6 +3254,10 @@ void Courtroom::start_chat_ticking()
 | 
			
		||||
      ui_vp_chatbox->show();
 | 
			
		||||
      ui_vp_message->show();
 | 
			
		||||
    }
 | 
			
		||||
    else {
 | 
			
		||||
      ui_vp_chatbox->hide();
 | 
			
		||||
      ui_vp_message->hide();
 | 
			
		||||
    }
 | 
			
		||||
    // If we're not already waiting on the next message, start the timer. We could be overriden if there's an objection planned.
 | 
			
		||||
    int delay = ao_app->stay_time();
 | 
			
		||||
    if (delay > 0 && !text_queue_timer->isActive())
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user