diff options
| author | Cerapter <cerap@protonmail.com> | 2018-08-19 09:19:18 +0200 |
|---|---|---|
| committer | Cerapter <cerap@protonmail.com> | 2018-08-19 09:19:18 +0200 |
| commit | c316e81e0c28a5f62e55f4a727f0ca152ab9874b (patch) | |
| tree | dd6171f04937415b3246ce19a749e5fe3df9a565 | |
| parent | 7de64bd0c085216e7c88e15860d4e34cd79e6586 (diff) | |
Reset the default background to `default`.
Reimplementation of `bed0b55e70f13adf772584fc0d31ebfe59597115` from old
origin.
| -rw-r--r-- | courtroom.h | 2 | ||||
| -rw-r--r-- | path_functions.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/courtroom.h b/courtroom.h index 3cb3c10a..8dfa54ad 100644 --- a/courtroom.h +++ b/courtroom.h @@ -299,7 +299,7 @@ private: //whether the ooc chat is server or master chat, true is server bool server_ooc = true; - QString current_background = "gs4"; + QString current_background = "default"; AOMusicPlayer *music_player; AOSfxPlayer *sfx_player; diff --git a/path_functions.cpp b/path_functions.cpp index 6e772dbb..51ddcfdf 100644 --- a/path_functions.cpp +++ b/path_functions.cpp @@ -96,7 +96,7 @@ QString AOApplication::get_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() @@ -118,5 +118,5 @@ QString Courtroom::get_background_path() QString Courtroom::get_default_background_path() { - return ao_app->get_base_path() + "background/gs4/"; + return ao_app->get_base_path() + "background/default/"; } |