X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Ffonts.cpp;h=af9a9368ca2e06a02240c08a0710f0710ae575d8;hp=2a7d2742ce6a663fcf8a7f9c3cdf1a4f9ab5d55e;hb=9c22e166f4d25f2d80766de9baab56efd9d952b0;hpb=88b3ef1f363e8181e7eb04e24f1646fe9782bb44

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index 2a7d274..af9a936 100644
--- a/bigscreen/fonts.cpp
+++ b/bigscreen/fonts.cpp
@@ -1,6 +1,7 @@
 #include <vector>
 #include <stdexcept>
 #include "fonts.h"
+#include "resolution.h"
 
 std::vector<FT_Face> fonts;
 
@@ -64,18 +65,18 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
 			for (y = 0; y < bm->rows; y++) {
 				int xx;
 				int dsty = ypos - slot->bitmap_top + y;
-				if (dsty < 0 || dsty > 599) continue;
+				if (dsty < 0 || dsty > (SCREEN_HEIGHT-1)) continue;
 
-				unsigned char *dst = buf + dsty * 800*4 + (x + xpos + slot->bitmap_left)*4;
+				unsigned char *dst = buf + dsty * SCREEN_WIDTH*4 + (x + xpos + slot->bitmap_left)*4;
 				unsigned char *src = bm->buffer + y * bm->width;
 
-				int width = (x + xpos + slot->bitmap_left + bm->width >= 800) ? (799 - x - xpos - slot->bitmap_left) : bm->width;
+				int width = (x + xpos + slot->bitmap_left + bm->width >= SCREEN_WIDTH) ? ((SCREEN_WIDTH-1) - x - xpos - slot->bitmap_left) : bm->width;
 				for (xx = 0; xx < width; xx++) {
-					*dst = (*dst * (256-*src) + r * *src) >> 8;
+					*dst = (*dst * (256-*src) + b * *src) >> 8;
 					*dst++;
 					*dst = (*dst * (256-*src) + g * *src) >> 8;
 					*dst++;
-					*dst = (*dst * (256-*src) + b * *src) >> 8;
+					*dst = (*dst * (256-*src) + r * *src) >> 8;
 					*dst++;
 					*dst++ = 0;
 					src++;