diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-07-26 11:17:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 11:17:50 -0500 |
| commit | 1bccc5c3d84e0197049f46a079330b9e6cd45977 (patch) | |
| tree | bbab89163d59133d8845b9d5dfc1f1270bb7c57b | |
| parent | 29f0e06bc80428a753f6c67012637e914fbe295a (diff) | |
| parent | 154ba64f4acfdbec4d9f32f2f35d18b0a27e0cb2 (diff) | |
Merge pull request #198 from Crystalwarrior/bugfix/max_colors
Fix max colors being one int off
| -rw-r--r-- | src/courtroom.cpp | 2 | ||||
| -rw-r--r-- | src/lobby.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 943a8f8d..2d22b5a7 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1591,7 +1591,7 @@ void Courtroom::on_chat_return_pressed() if (text_color < 0) f_text_color = "0"; - else if (text_color > max_colors) + else if (text_color >= max_colors) f_text_color = "0"; else f_text_color = QString::number(text_color); diff --git a/src/lobby.cpp b/src/lobby.cpp index 3d47416b..92878114 100644 --- a/src/lobby.cpp +++ b/src/lobby.cpp @@ -378,7 +378,7 @@ void Lobby::on_about_clicked() "Robotic Overlord, Shadowlions (aka Shali), Sierra, SomeGuy, " "Veritas, Wiso" "<p><b>Special thanks:</b><br>" - "CrazyJC and MaximumVolty (2.8 release); " + "CrazyJC (2.8 release director) and MaximumVolty (2.8 release promotion); " "Remy, Hibiki, court-records.net (sprites); Qubrick (webAO); " "Rue (website); Draxirch (UI design); " "Lewdton and Argoneus (tsuserver); " |