Replace 800x600 width a resolution from a .h file. Lots of positions are still hardco...

[ccbs] / bigscreen / fonts.cpp

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index 8ba809f..af9a936 100644 (file)
--- a/bigscreen/fonts.cpp
+++ b/bigscreen/fonts.cpp
@@ -1,6 +1,7 @@
 #include <vector>
 #include <stdexcept>
 #include "fonts.h"
 #include <vector>
 #include <stdexcept>
 #include "fonts.h"

+#include "resolution.h"

 
 std::vector<FT_Face> fonts;
 
 
 std::vector<FT_Face> fonts;
 


@@ -64,12 +65,12 @@ 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;
                        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;
 
                                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) + b * *src) >> 8;
                                        *dst++;
                                for (xx = 0; xx < width; xx++) {
                                        *dst = (*dst * (256-*src) + b * *src) >> 8;
                                        *dst++;