diff --git a/src/sys/graphics/main.cpp b/src/sys/graphics/main.cpp index 85ce5b3..28d0618 100755 --- a/src/sys/graphics/main.cpp +++ b/src/sys/graphics/main.cpp @@ -21,11 +21,11 @@ buf = new TGfx0(); buf2 = new TGfx0(); font = new TDPFont(buf); - buf->create(400,400,(TPixelFmt *)&def_pixfmt_8bpp); + buf->create(400,400,(TPixelFmt *)&def_pixfmt_16bpp); buf2->create(400,400,(TPixelFmt *)&def_pixfmt_15bpp); - result = font->Load("1.DPF"); + result = font->Load("OLDENG.DPF"); font->SetColor(1); - font->PutText(0,0,"SkeetSucks"); + font->PutText(0,0,"HelloWorld"); for (r=0; r<=15; r++) { for (g=0; g<=79; g++) if (buf->getpixel(g,r)) printf("*"); else printf(" "); diff --git a/src/sys/graphics/objfont.cpp b/src/sys/graphics/objfont.cpp index 50a1dad..a351297 100755 --- a/src/sys/graphics/objfont.cpp +++ b/src/sys/graphics/objfont.cpp @@ -57,6 +57,10 @@ return LoadFrom(FontFile,0); } // TFont::Load +bool TFont::LoadFrom(const char* FontFile, UInt32 Offset) { + return TRUE; +} // TFont::LoadFrom + bool TFont::Save(const char* FontFile) { return SaveTo(FontFile,0); } // TFont::Save @@ -108,6 +112,7 @@ ch = *TextString++; if ((CharWidthTable[ch]) && (ch!=' ')) { offset=(UInt8 *)(FontData); + offset+=FontDataIdx[ch]; for (yy=0; yy<=(UInt32)(CharHeightTable[ch]-1); yy++) for (xx=0; xx<=(UInt32)(CharWidthTable[ch]-1); xx++) { pix = *offset++; diff --git a/src/sys/graphics/objfont.h b/src/sys/graphics/objfont.h index 9f6b5b8..b215315 100755 --- a/src/sys/graphics/objfont.h +++ b/src/sys/graphics/objfont.h @@ -48,7 +48,7 @@ void CenterTextX(Int32, const char *); void JustifyText(UInt8, UInt8, const char *); bool Load(const char *); - // virtual bool LoadFrom(const char *, UInt32); + virtual bool LoadFrom(const char *, UInt32); bool Save(const char *); // virtual bool SaveTo(const char *, Int32) = 0; UInt32 TextHeight(const char *); @@ -65,7 +65,7 @@ } void SetColor(UInt32); void SetIdxColor(UInt8, UInt32); - void PutText(Int32, Int32, const char *); + virtual void PutText(Int32, Int32, const char *); }; class TDPFont : public TBMFont { @@ -80,9 +80,9 @@ NumOfChars = 0; StartingChar = 0; } - void PutText(Int32, Int32, const char *); - bool LoadFrom(const char *, UInt32); - bool SaveTo(const char *, Int32); + virtual void PutText(Int32, Int32, const char *); + virtual bool LoadFrom(const char *, UInt32); + virtual bool SaveTo(const char *, Int32); };