Bug fix, but was caught by other code. More efficient now.

diff --git a/src/boxx.cc b/src/boxx.cc
index 956830213868531843b6b316b225615b3e9f938f..cc568669934c3daf68ad659768fc0ae5b1e2ca76 100644 (file)
--- a/src/boxx.cc
+++ b/src/boxx.cc
@@ -338,7 +338,7 @@ int Boxx::drawPara(const char* text, int x, int y, const DrawStyle& colour, unsi
       if (charwidtharray)
       {
         thisCharWidth = charwidtharray[cur_char & 0xFF];
-        if (cur_char && 0xFFFFFF00) thisCharWidth = osdv->getCharWidth(cur_char);
+        if (cur_char & 0xFFFFFF00) thisCharWidth = osdv->getCharWidth(cur_char);
       }
       else
       {

diff --git a/src/surfacevector.cc b/src/surfacevector.cc
index a02dd18d220697550a3af0815cb2eb15129c7711..aec6b93aed61ad22d1521ba4e38900bbe82d8495 100644 (file)
--- a/src/surfacevector.cc
+++ b/src/surfacevector.cc
@@ -108,7 +108,7 @@ int SurfaceVector::drawText(const char* text, int x, int y, int width, const Dra
 
     float cur_shift = charwidtharray[tempo & 0xFF];
 
-    if (tempo && 0xFFFFFF00) cur_shift = osd->getCharWidth(tempo);
+    if (tempo & 0xFFFFFF00) cur_shift = osd->getCharWidth(tempo);
 
     shift += cur_shift;
     length -= num_bytes;