From 6c1434525fc138179b735a2932d78613461ba6d8 Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Fri, 8 Jul 2011 13:07:35 +0300
Subject: [PATCH] Fix bug in handling linefeeds in VGAChargen

---
 Changelog.utf8                      |  1 +
 org/jpc/pluginsaux/HUDRenderer.java | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Changelog.utf8 b/Changelog.utf8
index cddc0b1..66a7eed 100644
--- a/Changelog.utf8
+++ b/Changelog.utf8
@@ -12,6 +12,7 @@ Changes from JPC-RR Release 11.4 onwards:
 - Emulator status display.
 - Get gameinfo right in unattended dumping.
 - Some more VGA status display.
+- Fix bug in handling linefeeds in VGAChargen.
 
 Changes from JPC-RR Release 11.3 to JPC-RR Release 11.4:
 ========================================================
diff --git a/org/jpc/pluginsaux/HUDRenderer.java b/org/jpc/pluginsaux/HUDRenderer.java
index 0e0f241..10d1887 100644
--- a/org/jpc/pluginsaux/HUDRenderer.java
+++ b/org/jpc/pluginsaux/HUDRenderer.java
@@ -540,14 +540,13 @@ public class HUDRenderer
             for(int i = 0; i < len; i++) {
                 int ch = (int)vgaChargenString.charAt(i) & 0xFF;
                 if(multiline && (ch == 13 || ch == 10)) {
-                    ybase += 16;
                     xbase = x;
+                    ybase += 16;
+                } else if(!(xbase < -7 || ybase < -15 || xbase >= bw || ybase >= bh)) {
+                    renderPartial(buffer, bw, bh, xbase, ybase, vgaFontData[2 * ch + 0]);
+                    renderPartial(buffer, bw, bh, xbase, ybase + 8, vgaFontData[2 * ch + 1]);
+                    xbase += 8;
                 }
-                if(!(xbase < -7 || ybase < -15 || xbase >= bw || ybase >= bh)) {
-                    renderPartial(buffer, bw, bh, xbase, y, vgaFontData[2 * ch + 0]);
-                    renderPartial(buffer, bw, bh, xbase, y + 8, vgaFontData[2 * ch + 1]);
-                }
-                xbase += 8;
             }
         }
     }
-- 
2.11.4.GIT