aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCerapter <cerap@protonmail.com>2018-10-23 10:06:04 +0200
committerCerapter <cerap@protonmail.com>2018-10-23 10:06:04 +0200
commitbed38e0b7f42629c373e6a78b482541f1b3a4294 (patch)
treeebfb5332a378d9ab034eed82c054351a72f79011
parent3f41ed134121bfcf6e1bbbbac9fcd1aad49fbd6b (diff)
Fixed charselect showing the wrong amount of characters on its list, version bump.
-rw-r--r--aoapplication.h2
-rw-r--r--charselect.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/aoapplication.h b/aoapplication.h
index dc77014..aa34f13 100644
--- a/aoapplication.h
+++ b/aoapplication.h
@@ -274,7 +274,7 @@ private:
const int CCCC_RELEASE = 1;
const int CCCC_MAJOR_VERSION = 4;
- const int CCCC_MINOR_VERSION = 0;
+ const int CCCC_MINOR_VERSION = 1;
QString current_theme = "default";
diff --git a/charselect.cpp b/charselect.cpp
index ac73ac2..54286b2 100644
--- a/charselect.cpp
+++ b/charselect.cpp
@@ -158,6 +158,8 @@ void Courtroom::put_button_in_place(int starting, int chars_on_this_page)
char_columns = ((ui_char_buttons->width() - button_width) / (x_spacing + button_width)) + 1;
char_rows = ((ui_char_buttons->height() - button_height) / (y_spacing + button_height)) + 1;
+ max_chars_on_page = char_columns * char_rows;
+
int startout = starting;
for (int n = starting ; n < startout+chars_on_this_page ; ++n)
{