[Lapetus-cvs] lapetus font.c,1.2,1.3

[Theo B. <cyb...@us...>]

Update of /cvsroot/lapetus/lapetus
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31264

Modified Files:
	font.c 
Log Message:
-Added NBG support for font stuff

Index: font.c
===================================================================
RCS file: /cvsroot/lapetus/lapetus/font.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- font.c	9 Jan 2008 04:45:54 -0000	1.2
+++ font.c	3 Jun 2009 01:34:23 -0000	1.3
@@ -19,6 +19,8 @@
 
 #include "lapetus.h"
 
+extern vdp2settings_struct vdp2settings;
+
 //////////////////////////////////////////////////////////////////////////////
 
 int DrawCharVdp1(font_struct *font, int x, int y, int color, int charnum)
@@ -88,6 +90,23 @@
    {
       font->lineinc = 512; // fix me(should be detected)
       font->drawchar = DrawCharBitmap1bppTo8bpp;
+      font->out = (u8 *)0x25E00000;
+      switch (screen)
+      {
+         case SCREEN_NBG0:
+            font->out += ((u32)vdp2settings.MPOFN.part.n0mp << 17);
+            break;
+         case SCREEN_NBG1:
+            font->out += ((u32)vdp2settings.MPOFN.part.n1mp << 17);
+            break;
+         case SCREEN_NBG2:
+            font->out += ((u32)vdp2settings.MPOFN.part.n2mp << 17);
+            break;
+         case SCREEN_NBG3:
+            font->out += ((u32)vdp2settings.MPOFN.part.n3mp << 17);
+            break;
+         default: break;
+      }      
    }
 
    font->screen = screen;