Made a miscellaneous change; font size and spacing are now DataContainer vars

diff --git a/bin/vndc.x86_64 b/bin/vndc.x86_64
new file mode 100755 (executable)
index 0000000..7f8ea8d
Binary files /dev/null and b/bin/vndc.x86_64 differ

diff --git a/vndc/include/Data.hpp b/vndc/include/Data.hpp
index 6758d34cc1600f49b00c26bd72ace644c94305dc..7bf4fab386517546ea96b660272ac3e8601374ea 100644 (file)
--- a/vndc/include/Data.hpp
+++ b/vndc/include/Data.hpp
@@ -20,6 +20,8 @@ class DataContainer {
                int render_y1;
                int render_x2;
                int render_y2;
+               int text_gap;
+               int text_size;
                int text_x;
                int text_y;
                std::map<std::string, int> *s_flags;

diff --git a/vndc/include/gitrev.hpp b/vndc/include/gitrev.hpp
index 4c7297c1627043e55a8a44162b8b0eb5cb079723..fde0a33dd4bccb0d84a7376d9904d15d668cbcaf 100644 (file)
--- a/vndc/include/gitrev.hpp
+++ b/vndc/include/gitrev.hpp
@@ -1,5 +1,5 @@
 #ifndef GIT_REV_HDR
 #define GIT_REV_HDR
-#define GIT_REV "256da2f3a0597798795d1e838783d74a2e1d4f41"
+#define GIT_REV "5ffbbb9138bc91e95291e2f89f3fbf30e8b33d91"
 
 #endif

diff --git a/vndc/src/Data.cpp b/vndc/src/Data.cpp
index 329a30beecb2c057458b2573b6c2961fe52c111d..71b1dc90cd99626f9f5311945511bdbad9357253 100644 (file)
--- a/vndc/src/Data.cpp
+++ b/vndc/src/Data.cpp
@@ -19,6 +19,8 @@ DataContainer::DataContainer() {
        render_y2 = screen_h / 15 * 13;
        text_x = render_x1;
        text_y = render_y1;
+       text_gap = 35;
+       text_size = 24;
        jumped = false;
        choice_coords = NULL;
        choices = 0;

diff --git a/vndc/src/Loop.cpp b/vndc/src/Loop.cpp
index cb47edd0f9eb9189d68c6738497a12e2fb1e575d..87544f676e2c52c8b8a203d6c2a071ca91ef3526 100644 (file)
--- a/vndc/src/Loop.cpp
+++ b/vndc/src/Loop.cpp
@@ -55,7 +55,7 @@ void Setup() {
        GetData()->s_flags = new std::map<std::string, int>();
 
        // Font
-       GetData()->ctx->Text()->LoadFont((char*)"default.ttf", 24);
+       GetData()->ctx->Text()->LoadFont((char*)"default.ttf", GetData()->text_size);
        GetData()->ctx->Text()->SetFontUsed(1);
 
        GetData()->ctx->Text()->Outline(1);

diff --git a/vndc/src/op_text.cpp b/vndc/src/op_text.cpp
index 6b3be614d924b6fbd9489f6df40f89cde0fca4d0..87aa3ca88a1b21b064730b3888b79ccee28a53fb 100644 (file)
--- a/vndc/src/op_text.cpp
+++ b/vndc/src/op_text.cpp
@@ -102,13 +102,13 @@ void op_text(char* string) {
                                ++lines;
                        }
 
-                       if( ( lines * 35 + GetData()->text_y ) > GetData()->render_y2 )
+                       if( ( lines * GetData()->text_gap + GetData()->text_y ) > GetData()->render_y2 )
                                op_cleartext();
 
                        for(int i=0; i < lines; i++) {
                                //printf("[br] %s\n", ptrs[i]);
                                txt->Render(ptrs[i], GetData()->text_x, GetData()->text_y);
-                               GetData()->text_y += 35;
+                               GetData()->text_y += GetData()->text_gap;
                        }
 
                        free(ptrs);
@@ -116,7 +116,7 @@ void op_text(char* string) {
                }
                else {
                        txt->Render(string, GetData()->text_x, GetData()->text_y);
-                       GetData()->text_y += 35;
+                       GetData()->text_y += GetData()->text_gap;
                }
 
                if(!noclick) {