Merge pull request #144 from Dirtywave/model2_support

Fixing fonts / rendering with version 3.3.0

src/font1.h

@@ -3,8 +3,8 @@
 struct inline_font font_v1_small = {
     470,
     7,
-    8,
-    10,
+    5,
+    7,
     0,
     0,
     3,

src/font2.h

@@ -3,8 +3,8 @@
 struct inline_font font_v1_large = {
     752,
     9,
-    10,
-    12,
+    8,
+    9,
     0,
     -40,
     4,

src/font4.h

@@ -3,8 +3,8 @@
 struct inline_font font_v2_large = {
 940,
 10,
-12,
-14,
+10,
+10,
 0,
 -2,
 4,

src/font5.h

@@ -3,8 +3,8 @@
 struct inline_font font_v2_huge = {
 1128,
 12,
-15,
-16,
+12,
+12,
 0,
 -54,
 4,

src/inprint2.c

@@ -123,10 +123,8 @@ void inprint(SDL_Renderer *dst, const char *str, Uint32 x, Uint32 y,
                              (Uint8)((bgcolor & 0x0000FF00) >> 8),
                              (Uint8)((bgcolor & 0x000000FF)), 0xFF);
       bg_rect = d_rect;
-      bg_rect.w = selected_inline_font->glyph_x - 1;
+      bg_rect.w = selected_inline_font->glyph_x;
       bg_rect.h = selected_inline_font->glyph_y;
-      bg_rect.x--;
-      bg_rect.y--;
 
       SDL_RenderFillRect(dst, &bg_rect);
     }

src/render.c

@@ -121,28 +121,39 @@ void set_m8_model(unsigned int model) {
   switch (model) {
   case 1:
     m8_hardware_model = 1;
-    waveform_max_height = 38;
     check_and_adjust_window_and_texture_size(480, 320);
     break;
   default:
     m8_hardware_model = 0;
-    waveform_max_height = 20;
     check_and_adjust_window_and_texture_size(320, 240);
     break;
   }
 }
 
 void set_font_mode(unsigned int mode) {
+  if (mode < 0 || mode > 2) {
+    //bad font mode
+    return;
+  }
+  if (m8_hardware_model == 1) {
+    mode += 2;
+  }
   if (font_mode == mode) return;
-  if (mode >= 0 && mode <= 2) {
-    if (m8_hardware_model == 1) {
-      mode += 2;
+
+  font_mode = mode;
+  screen_offset_y = fonts[mode]->screen_offset_y;
+  text_offset_y = fonts[mode]->text_offset_y;
+
+  if (m8_hardware_model == 0) {
+    waveform_max_height = 20;
+  } else {
+    waveform_max_height = 38;
+    if(font_mode == 4) {
+      waveform_max_height = 20;
     }
-    font_mode = mode;
-    screen_offset_y = fonts[mode]->screen_offset_y;
-    text_offset_y = fonts[mode]->text_offset_y;
-    change_font(fonts[mode]);
   }
+
+  change_font(fonts[mode]);
   SDL_LogDebug(SDL_LOG_CATEGORY_RENDER,"Font mode %i, Screen offset %i", mode, screen_offset_y);
 }