diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp index b40947ea..8be1a5f8 100644 --- a/desktop_version/src/Graphics.cpp +++ b/desktop_version/src/Graphics.cpp @@ -3238,18 +3238,6 @@ void Graphics::textboxcentery(void) textboxes[m].should_centery = true; } -int Graphics::textboxwrap(int pad) -{ - // TODO: delete this function? - if (!INBOUNDS_VEC(m, textboxes)) - { - vlog_error("textboxwrap() out-of-bounds!"); - return 16; - } - - return textboxes[m].wrap(pad); -} - void Graphics::textboxpad(size_t left_pad, size_t right_pad) { if (!INBOUNDS_VEC(m, textboxes)) diff --git a/desktop_version/src/Graphics.h b/desktop_version/src/Graphics.h index 551d0d7c..9c97e571 100644 --- a/desktop_version/src/Graphics.h +++ b/desktop_version/src/Graphics.h @@ -102,8 +102,6 @@ public: void textboxcentery(void); - int textboxwrap(int pad); - void textboxpad(size_t left_pad, size_t right_pad); void textboxpadtowidth(size_t new_w); diff --git a/desktop_version/src/Textbox.cpp b/desktop_version/src/Textbox.cpp index 499440ad..a95eb87c 100644 --- a/desktop_version/src/Textbox.cpp +++ b/desktop_version/src/Textbox.cpp @@ -274,7 +274,7 @@ void textboxclass::centertext(void) padtowidth(w-16); } -int textboxclass::wrap(int pad) +void textboxclass::wrap(int pad) { /* This function just takes a single-line textbox and wraps it... * pad = the total number of characters we are going to pad this textbox. @@ -285,7 +285,7 @@ int textboxclass::wrap(int pad) if (lines.empty()) { vlog_error("textboxclass::wrap() has no first line!"); - return 16; + return; } std::string wrapped = font::string_wordwrap_balanced( @@ -304,8 +304,6 @@ int textboxclass::wrap(int pad) addline(wrapped.substr(startline, newline-startline)); startline = newline + 1; } while (newline != std::string::npos); - - return h; } void textboxclass::copyoriginaltext(void) diff --git a/desktop_version/src/Textbox.h b/desktop_version/src/Textbox.h index 4483491c..97b12d61 100644 --- a/desktop_version/src/Textbox.h +++ b/desktop_version/src/Textbox.h @@ -97,7 +97,7 @@ public: void centertext(void); - int wrap(int pad); + void wrap(int pad); void copyoriginaltext(void);