diff options
Diffstat (limited to 'src/menu')
| -rw-r--r-- | src/menu/UDisplay.pas | 6 | ||||
| -rw-r--r-- | src/menu/UMenuSelectSlide.pas | 6 | ||||
| -rw-r--r-- | src/menu/UMenuText.pas | 16 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/menu/UDisplay.pas b/src/menu/UDisplay.pas index bea9b58d..f4cca4a5 100644 --- a/src/menu/UDisplay.pas +++ b/src/menu/UDisplay.pas @@ -397,16 +397,16 @@ begin //FPS SetFontPos(695, 0); - glPrint (PChar('FPS: ' + InttoStr(LastFPS))); + glPrint ('FPS: ' + InttoStr(LastFPS)); //RSpeed SetFontPos(695, 13); - glPrint (PChar('RSpeed: ' + InttoStr(Round(1000 * TimeMid)))); + glPrint ('RSpeed: ' + InttoStr(Round(1000 * TimeMid))); //LastError SetFontPos(695, 26); glColor4f(1, 0, 0, 1); - glPrint (PChar(OSD_LastError)); + glPrint (OSD_LastError); glColor4f(1, 1, 1, 1); end; diff --git a/src/menu/UMenuSelectSlide.pas b/src/menu/UMenuSelectSlide.pas index ed1db6cf..d04b20d0 100644 --- a/src/menu/UMenuSelectSlide.pas +++ b/src/menu/UMenuSelectSlide.pas @@ -333,8 +333,8 @@ begin for I := low(TextOptT) to high (TextOptT) do begin - if (glTextWidth(PChar(TextOptT[I])) > maxlength) then - maxlength := glTextWidth(PChar(TextOptT[I])); + if (glTextWidth(TextOptT[I]) > maxlength) then + maxlength := glTextWidth(TextOptT[I]); end; Lines := floor((TextureSBG.W-40) / (maxlength+7)); @@ -374,7 +374,7 @@ begin //Better Look with 2 Options if (Lines=2) AND (Length(TextOptT)= 2) then - TextOpt[I].X := TextureSBG.X + 20 + (TextureSBG.W -40 - glTextWidth(PChar(TextOptT[1]))) * I; + TextOpt[I].X := TextureSBG.X + 20 + (TextureSBG.W -40 - glTextWidth(TextOptT[1])) * I; end; end; diff --git a/src/menu/UMenuText.pas b/src/menu/UMenuText.pas index 1a7c15a1..5c41eba5 100644 --- a/src/menu/UMenuText.pas +++ b/src/menu/UMenuText.pas @@ -200,7 +200,7 @@ begin if isBreak then begin //Look for Break before the Break - if (glTextWidth(PChar(Copy(Value, LastBreak, NextPos - LastBreak + 1))) > W) AND (NextPos-LastPos > 1) then + if (glTextWidth(Copy(Value, LastBreak, NextPos - LastBreak + 1)) > W) AND (NextPos-LastPos > 1) then begin isBreak := False; //Not the First word after Break, so we don't have to break within a word @@ -221,7 +221,7 @@ begin AddBreak(LastBreak, NextPos); end //Text comes out of the Text Area -> CreateBreak - else if (glTextWidth(PChar(Copy(Value, LastBreak, NextPos - LastBreak + 1))) > W) then + else if (glTextWidth(Copy(Value, LastBreak, NextPos - LastBreak + 1)) > W) then begin //Not the First word after Break, so we don't have to break within a word if (FirstWord > 1) then @@ -295,12 +295,12 @@ begin case Align of 0: X2 := X; - 1: X2 := X - glTextWidth(pchar(Text2))/2; - 2: X2 := X - glTextWidth(pchar(Text2)); + 1: X2 := X - glTextWidth(Text2)/2; + 2: X2 := X - glTextWidth(Text2); end; SetFontPos(X2, Y); - glPrint(PChar(Text2)); + glPrint(Text2); SetFontStyle(0); // reset to default end else @@ -317,15 +317,15 @@ begin case Align of 0: X2 := X + MoveX; - 1: X2 := X + MoveX - glTextWidth(pchar(Text2))/2; - 2: X2 := X + MoveX - glTextWidth(pchar(Text2)); + 1: X2 := X + MoveX - glTextWidth(Text2)/2; + 2: X2 := X + MoveX - glTextWidth(Text2); end; SetFontPos(X2, Y2); SetFontZ(Z); - glPrint(PChar(Text2)); + glPrint(Text2); {if Size >= 10 then Y2 := Y2 + Size * 0.93 |