generic line wrapping

3 files changed, 7 insertions, 3 deletions

diff --git a/src/engine/client/gfx.cpp b/src/engine/client/gfx.cpp
index 1c871e28..dafdfa06 100644
--- a/src/engine/client/gfx.cpp
+++ b/src/engine/client/gfx.cpp
@@ -790,7 +790,7 @@ double extra_kerning[256*256] = {0};
 
 pretty_font *current_font = &default_font;
 
-void gfx_pretty_text(float x, float y, float size, const char *text)
+void gfx_pretty_text(float x, float y, float size, const char *text, int max_width)
 {
 	const float spacing = 0.05f;
 	gfx_texture_set(current_font->font_texture);
@@ -826,6 +826,12 @@ void gfx_pretty_text(float x, float y, float size, const char *text)
 				x_nudge = extra_kerning[text[0] + text[1] * 256];
 
 			x += (width + current_font->m_CharStartTable[c] + spacing + x_nudge) * size;
+
+			if (max_width != -1 && x - startx > max_width)
+			{
+				x = startx;
+				y += size - 2;
+			}
 		}
 
 		text++;
diff --git a/src/engine/client/snd.cpp b/src/engine/client/snd.cpp
index 69cca0f5..c28efe05 100644
--- a/src/engine/client/snd.cpp
+++ b/src/engine/client/snd.cpp
@@ -269,7 +269,6 @@ int snd_load_wv(const char *filename)
 	{
 		int samples = WavpackGetNumSamples(context);
 		int bitspersample = WavpackGetBitsPerSample(context);
-		int bytespersample = WavpackGetBytesPerSample(context);
 		unsigned int samplerate = WavpackGetSampleRate(context);
 		int channels = WavpackGetNumChannels(context);
 
diff --git a/src/engine/client/ui.cpp b/src/engine/client/ui.cpp
index d7a0a4d8..7b309539 100644
--- a/src/engine/client/ui.cpp
+++ b/src/engine/client/ui.cpp
@@ -15,7 +15,6 @@ struct pretty_font
 };
 
 extern pretty_font *current_font;
-void gfx_pretty_text(float x, float y, float size, const char *text);
 
 static void *hot_item = 0;
 static void *active_item = 0;