diff options
| -rw-r--r-- | .gitlab-ci.yml | 22 | ||||
| -rw-r--r-- | Attorney_Online.pro | 4 | ||||
| -rw-r--r-- | base/themes/default/courtroom_design.ini | 2 | ||||
| -rw-r--r-- | include/aoapplication.h | 6 | ||||
| -rwxr-xr-x | scripts/configure_ubuntu.sh | 2 | ||||
| -rw-r--r-- | src/charselect.cpp | 1 |
6 files changed, 19 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f68fe5a..e2abad6e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,15 +29,15 @@ build linux x86_64: - clang --version # Extract BASS - - mkdir bass - - cd bass - - curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip - - unzip bass.zip - - cp x64/libbass.so ../lib - - curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip - - unzip bassopus.zip - - cp x64/libbassopus.so ../lib - - cd .. + #- mkdir bass + #- cd bass + #- curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip + #- unzip bass.zip + #- cp x64/libbass.so ../lib + #- curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip + #- unzip bassopus.zip + #- cp x64/libbassopus.so ../lib + #- cd .. # Extract Discord RPC - mkdir discord-rpc @@ -56,7 +56,7 @@ build linux x86_64: - cd .. # Build - - qmake -spec linux-clang + - qmake -spec linux-clang "DEFINES += DISCORD QTAUDIO" - make -j4 # Post-processing @@ -88,7 +88,7 @@ build windows i686: - cd .. # Build - - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake + - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake "DEFINES += DISCORD BASSAUDIO" - make -j4 # Post-processing diff --git a/Attorney_Online.pro b/Attorney_Online.pro index b7476190..32781a1b 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -16,13 +16,13 @@ HEADERS += $$files($$PWD/include/*.h) LIBS += -L$$PWD/lib -DEFINES += DISCORD +#DEFINES += DISCORD contains(DEFINES, DISCORD) { LIBS += -ldiscord-rpc } -DEFINES += BASSAUDIO +#DEFINES += BASSAUDIO contains(DEFINES, BASSAUDIO) { LIBS += -lbass diff --git a/base/themes/default/courtroom_design.ini b/base/themes/default/courtroom_design.ini index 960d6e4c..eee76251 100644 --- a/base/themes/default/courtroom_design.ini +++ b/base/themes/default/courtroom_design.ini @@ -107,7 +107,7 @@ pre = 5, 490, 80, 21 flip = 104, 490, 51, 21 ; Guard button -guard = 200, 560, 61, 21 +guard = 200, 580, 61, 21 pre_no_interrupt = 200, 490, 80, 21 diff --git a/include/aoapplication.h b/include/aoapplication.h index 67f9a0d5..af43cf3c 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -95,9 +95,9 @@ public: //////////////////versioning/////////////// - const int get_release() const { return RELEASE; } - const int get_major_version() const { return MAJOR_VERSION; } - const int get_minor_version() const { return MINOR_VERSION; } + int get_release() const { return RELEASE; } + int get_major_version() const { return MAJOR_VERSION; } + int get_minor_version() const { return MINOR_VERSION; } QString get_version_string(); /////////////////////////////////////////// diff --git a/scripts/configure_ubuntu.sh b/scripts/configure_ubuntu.sh index 6cad1f15..a3d07ede 100755 --- a/scripts/configure_ubuntu.sh +++ b/scripts/configure_ubuntu.sh @@ -7,7 +7,7 @@ set -eu ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/" -cd ${ROOT_DIR} +cd "${ROOT_DIR}" #need some openGL stuff sudo apt install libgl1-mesa-dev diff --git a/src/charselect.cpp b/src/charselect.cpp index 7e20c74e..0cfb7753 100644 --- a/src/charselect.cpp +++ b/src/charselect.cpp @@ -135,6 +135,7 @@ void Courtroom::char_clicked(int n_char) } else { + ao_app->send_server_packet(new AOPacket("PW#" + ui_char_password->text() + "#%")); ao_app->send_server_packet(new AOPacket("CC#" + QString::number(ao_app->s_pv) + "#" + QString::number(n_char) + "#" + get_hdid() + "#%")); } |