summaryrefslogtreecommitdiff
path: root/textscreen/txt_font.h
diff options
context:
space:
mode:
authorSimon Howard2009-07-13 00:52:26 +0000
committerSimon Howard2009-07-13 00:52:26 +0000
commit480a31094b7621dd7d65ec05a6e36964dca99b66 (patch)
tree11b218d674e828c12981d819b8f2396b680436df /textscreen/txt_font.h
parent37db69b86bc5052901e250578e9c3920886d79ff (diff)
parente66653a8a67f3613344ae4ea30b37403d6ff17cf (diff)
downloadchocolate-doom-480a31094b7621dd7d65ec05a6e36964dca99b66.tar.gz
chocolate-doom-480a31094b7621dd7d65ec05a6e36964dca99b66.tar.bz2
chocolate-doom-480a31094b7621dd7d65ec05a6e36964dca99b66.zip
Merge from trunk.
Subversion-branch: /branches/opl-branch Subversion-revision: 1624
Diffstat (limited to 'textscreen/txt_font.h')
-rw-r--r--textscreen/txt_font.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/textscreen/txt_font.h b/textscreen/txt_font.h
index 43d3b519..fa0fa186 100644
--- a/textscreen/txt_font.h
+++ b/textscreen/txt_font.h
@@ -28,7 +28,7 @@
#ifndef __FONT_H__
#define __FONT_H__
-static unsigned char int10_font_16[256 * 16] =
+static unsigned char main_font_data[] =
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -544,5 +544,12 @@ static unsigned char int10_font_16[256 * 16] =
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
+static txt_font_t main_font =
+{
+ main_font_data,
+ 8, // width
+ 16 // height
+};
+
#endif /* __FONT_H__ */