gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2025-02-15 04:57:06 -05:00
Code Issues Releases Wiki Activity

hotfix: font table format: fontGlyph is now exported

Browse Source
This commit is contained in:
M. Sz 2021-02-17 09:05:29 +01:00
parent 6043ca531f
commit 7a54465eb3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
d2common/d2fileformats/d2font/font.go
View File

@ -22,7 +22,8 @@ const (
unknown3BytesCount = 4 unknown3BytesCount = 4
) )
type fontGlyph struct { // FontGlyph represents a single font glyph
type FontGlyph struct {
unknown1 []byte unknown1 []byte
unknown2 []byte unknown2 []byte
unknown3 []byte unknown3 []byte
@ -31,17 +32,17 @@ type fontGlyph struct {
height int height int
} }
func (fg *fontGlyph) setHeight(h int) { func (fg *FontGlyph) setHeight(h int) {
fg.height = h fg.height = h
} }
// Size returns glyph's size // Size returns glyph's size
func (fg *fontGlyph) Size() (w, h int) { func (fg *FontGlyph) Size() (w, h int) {
return fg.width, fg.height return fg.width, fg.height
} }
// FrameIndex returns glyph's frame // FrameIndex returns glyph's frame
func (fg *fontGlyph) FrameIndex() int { func (fg *FontGlyph) FrameIndex() int {
return fg.frame return fg.frame
} }
@ -50,7 +51,7 @@ type Font struct {
unknownHeaderBytes []byte unknownHeaderBytes []byte
sheet d2interface.Animation sheet d2interface.Animation
table []byte table []byte
Glyphs map[rune]*fontGlyph Glyphs map[rune]*FontGlyph
color color.Color color color.Color
} }
@ -167,7 +168,7 @@ func (f *Font) RenderText(text string, target d2interface.Surface) error {
} }
func (f *Font) initGlyphs(sr *d2datautils.StreamReader) error { func (f *Font) initGlyphs(sr *d2datautils.StreamReader) error {
glyphs := make(map[rune]*fontGlyph) glyphs := make(map[rune]*FontGlyph)
for i := 12; i < len(f.table); i += 14 { for i := 12; i < len(f.table); i += 14 {
code, err := sr.ReadUInt16() code, err := sr.ReadUInt16()
@ -175,7 +176,7 @@ func (f *Font) initGlyphs(sr *d2datautils.StreamReader) error {
return err return err
} }
var glyph fontGlyph var glyph FontGlyph
// two bytes of 0 // two bytes of 0
glyph.unknown1, err = sr.ReadBytes(unknown1BytesCount) glyph.unknown1, err = sr.ReadBytes(unknown1BytesCount)