gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

creature names font fix

This commit is contained in:
Henrique Santiago 2011-12-21 02:43:51 -02:00
parent 2b25ffd86b
commit e6d1252b34
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core_fonts/verdana-11px-rounded.otfont
View File

@ -3,6 +3,7 @@ Font
texture: verdana-11px-rounded.png texture: verdana-11px-rounded.png
height: 14 height: 14
glyph-size: 16 16 glyph-size: 16 16
spacing: -1 0
glyph-widths: glyph-widths:
32: 4 32: 4

6
src/framework/graphics/font.cpp
View File

@ -188,7 +188,9 @@ const std::vector<Point>& Font::calculateGlyphsPositions(const std::string& text
lineWidths.resize(lines+1); lineWidths.resize(lines+1);
lineWidths[lines] = 0; lineWidths[lines] = 0;
} else if(glyph >= 32) { } else if(glyph >= 32) {
lineWidths[lines] += m_glyphsSize[glyph].width(); lineWidths[lines] += m_glyphsSize[glyph].width() ;
if((i+1 != textLength && text[i+1] != '\n')) // only add space if letter is not the last or before a \n.
lineWidths[lines] += m_glyphSpacing.width();
maxLineWidth = std::max(maxLineWidth, lineWidths[lines]); maxLineWidth = std::max(maxLineWidth, lineWidths[lines]);
} }
} }
@ -221,7 +223,7 @@ const std::vector<Point>& Font::calculateGlyphsPositions(const std::string& text
// render only if the glyph is valid // render only if the glyph is valid
if(glyph >= 32 && glyph != (uchar)'\n') { if(glyph >= 32 && glyph != (uchar)'\n') {
virtualPos.x += m_glyphsSize[glyph].width(); virtualPos.x += m_glyphsSize[glyph].width() + m_glyphSpacing.width();
} }
} }

3
src/otclient/net/protocolgameparse.cpp
View File

@ -1055,6 +1055,9 @@ ThingPtr ProtocolGame::internalGetThing(InputMessage& msg)
uint32 id = msg.getU32(); uint32 id = msg.getU32();
std::string name = msg.getString(); std::string name = msg.getString();
if(name.length() > 0) // every creature name must have a capital letter
name[0] = toupper(name[0]);
g_map.removeCreatureById(removeId); g_map.removeCreatureById(removeId);
if(m_localPlayer->getId() == id) if(m_localPlayer->getId() == id)