Mercurial > mm7
diff GUIFont.h @ 1463:b330df6a2183
Слияние
author | Ritor1 |
---|---|
date | Sun, 11 Aug 2013 12:09:33 +0600 |
parents | dfc9484ed94c |
children | 63e1388c5463 |
line wrap: on
line diff
--- a/GUIFont.h Sun Aug 11 12:09:09 2013 +0600 +++ b/GUIFont.h Sun Aug 11 12:09:33 2013 +0600 @@ -24,7 +24,7 @@ int GetLineWidth(const char *pString); int CalcTextHeight(const char *pString, struct GUIWindow *pWindow, int uXOffset, int a5); int GetStringHeight2(GUIFont *secondFont, const char *text_str, GUIWindow* pWindow, int startX, int a6); - char* _44C6C2(const char *pInString, GUIWindow *pWindow, unsigned int uX, int a5); + char* GetPageTop(const char *pInString, GUIWindow *pWindow, unsigned int uX, int a5); void DrawTextLineToBuff(int uColor, int a3, unsigned short* uX_buff_pos, const char *text, int line_width); void DrawTextLine(unsigned int uDefaultColor, signed int uX, signed int uY, const char *text, int max_len_pix); void _44D2FD_prolly_draw_credits_entry(GUIFont *pSecondFont, int uFrameX, int uFrameY, unsigned int w, unsigned int h,