diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2018-07-05 21:33:27 -0500 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2018-07-05 21:33:27 -0500 |
| commit | 064cde6759aa1264cbd00d7c052aaf1a223af7a9 (patch) | |
| tree | 9dcad680bed3ab139dfa334276198cad0e45ce0d /path_functions.cpp | |
| parent | 17601c3723a181e348e37eddcc04bf506165cb72 (diff) | |
| parent | 42e26d67756afc2cb8cdeb97ed654507c7cf4f3e (diff) | |
Merge branch 'discord-toggle'
Diffstat (limited to 'path_functions.cpp')
| -rw-r--r-- | path_functions.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/path_functions.cpp b/path_functions.cpp index 6e772dbb..820c05a6 100644 --- a/path_functions.cpp +++ b/path_functions.cpp @@ -29,21 +29,6 @@ QString AOApplication::get_base_path() #endif } return base_path; - /* -#ifdef OMNI_DEBUG - return "/media/omnitroid/Data/winshare/AO/client/base/"; -#elif OMNI_DEBUG2 - return "/home/omnitroid/winshare/AO/client/base/"; -#elif defined(OMNI_WIN_DEBUG) - return "E:/AO/client/base/"; -#elif defined(OMNI_WIN_DEBUG2) - return "F:/winshare/AO/client/base/"; -#elif defined(ANDROID) - return "/storage/extSdCard/AO2/"; -#else - return QDir::currentPath() + "/base/"; -#endif -*/ } QString AOApplication::get_data_path() @@ -96,7 +81,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 +103,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/"; } |
