mirror of
https://github.com/GTAmodding/re3.git
synced 2025-07-17 17:34:08 +00:00
Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes
This commit is contained in:
parent
1fa852f118
commit
f71953077d
35 changed files with 1428 additions and 1134 deletions
|
@ -228,8 +228,8 @@ CFont::Initialise(void)
|
|||
SetColor(CRGBA(0xFF, 0xFF, 0xFF, 0));
|
||||
SetJustifyOff();
|
||||
SetCentreOff();
|
||||
SetWrapx(DEFAULT_SCREEN_WIDTH);
|
||||
SetCentreSize(DEFAULT_SCREEN_WIDTH);
|
||||
SetWrapx(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
|
||||
SetCentreSize(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
|
||||
SetBackgroundOff();
|
||||
SetBackgroundColor(CRGBA(0x80, 0x80, 0x80, 0x80));
|
||||
SetBackGroundOnlyTextOff();
|
||||
|
@ -996,22 +996,10 @@ CFont::GetStringWidth(wchar *s, bool spaces)
|
|||
{
|
||||
for (wchar c = *s; (c != ' ' || spaces) && c != '\0'; c = *(++s)) {
|
||||
if (c == '~') {
|
||||
|
||||
// This is original code
|
||||
#if 0
|
||||
s++;
|
||||
while (*s != '~') {
|
||||
s++;
|
||||
}
|
||||
#else
|
||||
// TODO(Miami): This is my code to prevent fuck up until InsertPlayerControlKeysInString is done
|
||||
if (*(s + 1) != '~') {
|
||||
s++;
|
||||
while (*s != '~') {
|
||||
s++;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else {
|
||||
w += GetCharacterSize(c - ' ');
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue