mirror of
				https://github.com/OpenMW/openmw.git
				synced 2025-11-04 07:56:40 +00:00 
			
		
		
		
	Fix dialogue goodbye link conflicting with choice links
This commit is contained in:
		
							parent
							
								
									8103d25b09
								
							
						
					
					
						commit
						f9ae0d9d66
					
				
					 1 changed files with 3 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -533,9 +533,11 @@ namespace MWGui
 | 
			
		|||
 | 
			
		||||
        if (mGoodbye)
 | 
			
		||||
        {
 | 
			
		||||
            Goodbye* link = new Goodbye();
 | 
			
		||||
            mLinks.push_back(link);
 | 
			
		||||
            std::string goodbye = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sGoodbye")->getString();
 | 
			
		||||
            BookTypesetter::Style* questionStyle = typesetter->createHotStyle(body, linkNormal, linkHot, linkActive,
 | 
			
		||||
                                                                              TypesetBook::InteractiveId(mLinks.back()));
 | 
			
		||||
                                                                              TypesetBook::InteractiveId(link));
 | 
			
		||||
            typesetter->lineBreak();
 | 
			
		||||
            typesetter->write(questionStyle, to_utf8_span(goodbye.c_str()));
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			@ -654,7 +656,6 @@ namespace MWGui
 | 
			
		|||
 | 
			
		||||
    void DialogueWindow::goodbye()
 | 
			
		||||
    {
 | 
			
		||||
        mLinks.push_back(new Goodbye());
 | 
			
		||||
        mGoodbye = true;
 | 
			
		||||
        mEnabled = false;
 | 
			
		||||
        updateHistory();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue