Mercurial > mm7
comparison GUIWindow.cpp @ 263:8cf4fe6b4941
Слияние
author | Ritor1 |
---|---|
date | Mon, 18 Feb 2013 12:38:38 +0600 |
parents | d1af3319bc44 |
children | fb890fb66cad |
comparison
equal
deleted
inserted
replaced
262:2d6dda2e0405 | 263:8cf4fe6b4941 |
---|---|
727 v4 = *(char **)v22; | 727 v4 = *(char **)v22; |
728 if ( *v3 ) | 728 if ( *v3 ) |
729 { | 729 { |
730 if ( v4 ) | 730 if ( v4 ) |
731 { | 731 { |
732 v5 = sub_495461(v4, uActiveCharacter - 1, 0, 0, 0, v3); | 732 v5 = BuilDialogueString(v4, uActiveCharacter - 1, 0, 0, 0, v3); |
733 v6 = pAutonoteFont->CalcTextHeight(v5, &v26, 1, 0); | 733 v6 = pAutonoteFont->CalcTextHeight(v5, &v26, 1, 0); |
734 v7 = (v6 - 3) / (signed int)v26.uFrameHeight; | 734 v7 = (v6 - 3) / (signed int)v26.uFrameHeight; |
735 v8 = v7 + 1; | 735 v8 = v7 + 1; |
736 if ( (signed int)v7 + 1 > 0 ) | 736 if ( (signed int)v7 + 1 > 0 ) |
737 { | 737 { |