Reset the default background to default.
				
					
				
			Reimplementation of `bed0b55e70f13adf772584fc0d31ebfe59597115` from old origin.
This commit is contained in:
		
							parent
							
								
									7de64bd0c0
								
							
						
					
					
						commit
						c316e81e0c
					
				@ -299,7 +299,7 @@ private:
 | 
				
			|||||||
  //whether the ooc chat is server or master chat, true is server
 | 
					  //whether the ooc chat is server or master chat, true is server
 | 
				
			||||||
  bool server_ooc = true;
 | 
					  bool server_ooc = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  QString current_background = "gs4";
 | 
					  QString current_background = "default";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  AOMusicPlayer *music_player;
 | 
					  AOMusicPlayer *music_player;
 | 
				
			||||||
  AOSfxPlayer *sfx_player;
 | 
					  AOSfxPlayer *sfx_player;
 | 
				
			||||||
 | 
				
			|||||||
@ -96,7 +96,7 @@ QString AOApplication::get_background_path()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
QString AOApplication::get_default_background_path()
 | 
					QString AOApplication::get_default_background_path()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  return get_base_path() + "background/gs4/";
 | 
					  return get_base_path() + "background/default/";
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QString AOApplication::get_evidence_path()
 | 
					QString AOApplication::get_evidence_path()
 | 
				
			||||||
@ -118,5 +118,5 @@ QString Courtroom::get_background_path()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
QString Courtroom::get_default_background_path()
 | 
					QString Courtroom::get_default_background_path()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  return ao_app->get_base_path() + "background/gs4/";
 | 
					  return ao_app->get_base_path() + "background/default/";
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user