diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-22 17:47:14 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-22 17:47:14 +0100 |
| commit | 861506d048b7c4370f066e62233448979824bd68 (patch) | |
| tree | caa435843c73aab13174a3b63bfb6dd759a9df73 /src/render | |
| parent | missing endlines (diff) | |
| parent | Remove all constexpr (diff) | |
| download | re3-861506d048b7c4370f066e62233448979824bd68.tar re3-861506d048b7c4370f066e62233448979824bd68.tar.gz re3-861506d048b7c4370f066e62233448979824bd68.tar.bz2 re3-861506d048b7c4370f066e62233448979824bd68.tar.lz re3-861506d048b7c4370f066e62233448979824bd68.tar.xz re3-861506d048b7c4370f066e62233448979824bd68.tar.zst re3-861506d048b7c4370f066e62233448979824bd68.zip | |
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/Coronas.cpp | 2 | ||||
| -rw-r--r-- | src/render/Credits.cpp | 626 | ||||
| -rw-r--r-- | src/render/Fluff.cpp | 38 | ||||
| -rw-r--r-- | src/render/Font.cpp | 4 | ||||
| -rw-r--r-- | src/render/Hud.cpp | 58 | ||||
| -rw-r--r-- | src/render/SpecialFX.cpp | 788 | ||||
| -rw-r--r-- | src/render/WaterCannon.cpp | 2 | ||||
| -rw-r--r-- | src/render/WaterCannon.h | 3 |
8 files changed, 761 insertions, 760 deletions
diff --git a/src/render/Coronas.cpp b/src/render/Coronas.cpp index 7d7242e4..b0868d0a 100644 --- a/src/render/Coronas.cpp +++ b/src/render/Coronas.cpp @@ -457,7 +457,7 @@ CCoronas::RenderReflections(void) continue; // Don't draw if reflection is too high - if(aCoronas[i].heightAboveRoad < 20.0){ + if(aCoronas[i].heightAboveRoad < 20.0f){ // don't draw if camera is below road if(CCoronas::aCoronas[i].coors.z - aCoronas[i].heightAboveRoad > TheCamera.GetPosition().z) continue; diff --git a/src/render/Credits.cpp b/src/render/Credits.cpp index 8f4e2270..b423fcc0 100644 --- a/src/render/Credits.cpp +++ b/src/render/Credits.cpp @@ -68,199 +68,199 @@ CCredits::Render(void) CFont::SetColor(CRGBA(220, 220, 220, 220)); CFont::SetFontStyle(FONT_HEADING); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED002"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED003"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED004"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED005"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED006"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED007"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED008"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED009"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED010"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED011"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED012"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED013"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED014"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED015"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED016"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED017"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED018"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED019"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.4, 0.82, TheText.Get("CRED020"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED021"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED022"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED245"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED023"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED024"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED025"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED026"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED027"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED028"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED257"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED029"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED030"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED031"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED032"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED033"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED244"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED034"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED035"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED247"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED036"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED037"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED038"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED039"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED040"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.4, 0.82, TheText.Get("CRED041"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED002"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED003"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED004"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED005"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED006"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED007"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED008"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED009"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED010"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED011"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED012"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED013"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED014"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED015"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED016"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED017"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED018"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED019"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.4f, 0.82f, TheText.Get("CRED020"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED021"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED022"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED245"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED023"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED024"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED025"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED026"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED027"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED028"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED257"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED029"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED030"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED031"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED032"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED033"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED244"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED034"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED035"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED247"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED036"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED037"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED038"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED039"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED040"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.4f, 0.82f, TheText.Get("CRED041"), lineoffset, scrolloffset); if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN) PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED042"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED043"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED042"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED043"), lineoffset, scrolloffset); if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN) PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED044"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED045"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED046"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED047"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED048"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED049"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED050"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRD050A"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED051"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED052"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED053"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED054"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED055"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED056"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED248"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED249"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED250"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED251"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED252"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED253"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED057"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED058"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED059"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED254"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED255"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED060"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED061"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED044"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED045"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED046"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED047"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED048"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED049"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED050"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRD050A"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED051"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED052"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED053"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED054"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED055"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED056"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED248"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED249"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED250"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED251"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED252"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED253"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED057"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED058"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED059"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED254"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED255"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED060"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED061"), lineoffset, scrolloffset); if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN) PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED062"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED063"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED064"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED065"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED062"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED063"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED064"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED065"), lineoffset, scrolloffset); PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED066"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED067"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED068"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED069"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED066"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED067"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED068"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED069"), lineoffset, scrolloffset); if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN) PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED070"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED071"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED070"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED071"), lineoffset, scrolloffset); PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED072"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED073"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED072"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED073"), lineoffset, scrolloffset); PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED074"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED075"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED076"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED077"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED078"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED079"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED080"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED081"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED082"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED083"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED084"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED242"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED259"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED260"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED261"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED262"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED085"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED074"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED075"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED076"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED077"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED078"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED079"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED080"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED081"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED082"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED083"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED084"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED242"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED259"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED260"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED261"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED262"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED085"), lineoffset, scrolloffset); if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN) PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED086"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.4, 0.82, TheText.Get("CRED087"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED086"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.4f, 0.82f, TheText.Get("CRED087"), lineoffset, scrolloffset); PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED088"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED089"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED088"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED089"), lineoffset, scrolloffset); PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED090"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED091"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED094"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED095"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED096"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED097"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED098"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED099"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED263"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED264"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED265"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED267"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED270"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED266"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.4, 0.82, TheText.Get("CRED100"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED090"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED091"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED094"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED095"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED096"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED097"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED098"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED099"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED263"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED264"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED265"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED267"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED270"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED266"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.4f, 0.82f, TheText.Get("CRED100"), lineoffset, scrolloffset); PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED101"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED102"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED103"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED104"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED105"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED106"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED268"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED269"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED107"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED101"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED102"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED103"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED104"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED105"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED106"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED268"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED269"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED107"), lineoffset, scrolloffset); PrintCreditSpace(1.5, lineoffset); PrintCreditText(1.0, 1.0, TheText.Get("CRED108"), lineoffset, scrolloffset); PrintCreditSpace(1.0, lineoffset); @@ -268,8 +268,8 @@ CCredits::Render(void) if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN) PrintCreditSpace(1.0, lineoffset); PrintCreditText(1.0, 1.0, TheText.Get("CRED110"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED111"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED111"), lineoffset, scrolloffset); PrintCreditText(1.0, 1.0, TheText.Get("CRED112"), lineoffset, scrolloffset); if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN) PrintCreditSpace(1.0, lineoffset); @@ -337,152 +337,152 @@ CCredits::Render(void) if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN) PrintCreditSpace(1.0, lineoffset); PrintCreditText(1.0, 1.0, TheText.Get("CRED134"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED135"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED136"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRD136A"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED137"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRD137A"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED138"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRD138A"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRD138B"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED135"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED136"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRD136A"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED137"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRD137A"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED138"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRD138A"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRD138B"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); PrintCreditText(1.0, 1.0, TheText.Get("CRED139"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.7, 1.0, TheText.Get("CRED140"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRD140A"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRD140B"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRD140C"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRD140D"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRD140E"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.4, 0.82, TheText.Get("CRED141"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.7f, 1.0f, TheText.Get("CRED140"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRD140A"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRD140B"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRD140C"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRD140D"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRD140E"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.4f, 0.82f, TheText.Get("CRED141"), lineoffset, scrolloffset); PrintCreditText(1.0, 1.0, TheText.Get("CRED142"), lineoffset, scrolloffset); PrintCreditSpace(1.0, lineoffset); PrintCreditText(1.0, 1.0, TheText.Get("CRED143"), lineoffset, scrolloffset); PrintCreditSpace(1.0, lineoffset); PrintCreditText(1.0, 1.0, TheText.Get("CRED144"), lineoffset, scrolloffset); PrintCreditSpace(1.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.4, 0.82, TheText.Get("CRED145"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED146"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED147"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED148"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED149"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED150"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED151"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED152"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED153"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED154"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED155"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED156"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED157"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED158"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED159"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED160"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED161"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED162"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED163"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED164"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED165"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED166"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED167"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED168"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED169"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED170"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED171"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED172"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED173"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED174"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED175"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED176"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED177"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED178"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED179"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED180"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED181"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED182"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED183"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED184"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED185"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED186"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED187"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED188"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED189"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED190"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED191"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED192"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED193"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED194"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED195"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED196"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED197"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED198"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED199"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED200"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED201"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED202"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED203"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED204"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED205"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED206"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED207"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED208"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED209"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED210"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED211"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED212"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED213"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED214"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED215"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED216"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED241"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.4, 0.82, TheText.Get("CRED217"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.4f, 0.82f, TheText.Get("CRED145"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED146"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED147"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED148"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED149"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED150"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED151"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED152"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED153"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED154"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED155"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED156"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED157"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED158"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED159"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED160"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED161"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED162"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED163"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED164"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED165"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED166"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED167"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED168"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED169"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED170"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED171"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED172"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED173"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED174"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED175"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED176"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED177"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED178"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED179"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED180"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED181"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED182"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED183"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED184"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED185"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED186"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED187"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED188"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED189"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED190"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED191"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED192"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED193"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED194"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED195"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED196"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED197"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED198"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED199"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED200"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED201"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED202"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED203"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED204"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED205"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED206"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED207"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED208"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED209"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED210"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED211"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED212"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED213"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED214"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED215"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED216"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED241"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.4f, 0.82f, TheText.Get("CRED217"), lineoffset, scrolloffset); PrintCreditSpace(1.5, lineoffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.4, 0.82, TheText.Get("CRED218"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.4f, 0.82f, TheText.Get("CRED218"), lineoffset, scrolloffset); PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRD218A"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRD218B"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.4, 0.82, TheText.Get("CRED219"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRD218A"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRD218B"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.4f, 0.82f, TheText.Get("CRED219"), lineoffset, scrolloffset); PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED220"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.4, 0.82, TheText.Get("CRED221"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED220"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.4f, 0.82f, TheText.Get("CRED221"), lineoffset, scrolloffset); PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED222"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.4, 0.82, TheText.Get("CRED223"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED224"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED225"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED226"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.4, 0.82, TheText.Get("CRED227"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED222"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.4f, 0.82f, TheText.Get("CRED223"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED224"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED225"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED226"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.4f, 0.82f, TheText.Get("CRED227"), lineoffset, scrolloffset); PrintCreditSpace(1.5, lineoffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED228"), lineoffset, scrolloffset); - PrintCreditText(1.7, 1.7, TheText.Get("CRED229"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditText(1.4, 0.82, TheText.Get("CRED230"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED231"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED232"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED233"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED234"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED235"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED236"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED237"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED238"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED239"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED240"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("LITTLE"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("NICK"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED243"), lineoffset, scrolloffset); - PrintCreditText(1.4, 1.4, TheText.Get("CRED244"), lineoffset, scrolloffset); - PrintCreditSpace(2.0, lineoffset); - PrintCreditSpace(2.0, lineoffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED228"), lineoffset, scrolloffset); + PrintCreditText(1.7f, 1.7f, TheText.Get("CRED229"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditText(1.4f, 0.82f, TheText.Get("CRED230"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED231"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED232"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED233"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED234"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED235"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED236"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED237"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED238"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED239"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED240"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("LITTLE"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("NICK"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED243"), lineoffset, scrolloffset); + PrintCreditText(1.4f, 1.4f, TheText.Get("CRED244"), lineoffset, scrolloffset); + PrintCreditSpace(2.0f, lineoffset); + PrintCreditSpace(2.0f, lineoffset); CFont::DrawFonts(); diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp index e0db5732..8d7fad92 100644 --- a/src/render/Fluff.cpp +++ b/src/render/Fluff.cpp @@ -106,17 +106,17 @@ void CMovingThings::Init() Num = 0; // Initialize scroll bars - aScrollBars[0].Init(CVector( 228.3f, -669.0f, 39.0f ), SCROLL_BUSINESS, 0.0, 0.5, 0.5, 255, 128, 0, 0.3); - aScrollBars[1].Init(CVector( 772.0f, 164.0f, -9.5f ), SCROLL_TRAFFIC, 0.0, 0.5, 0.25, 128, 255, 0, 0.3); - aScrollBars[2].Init(CVector(-1089.61f, -584.224f, 13.246f), SCROLL_AIRPORT_DOORS, 0.0, -0.1706, 0.107, 255, 0, 0, 0.11); - aScrollBars[3].Init(CVector(-1089.61f, -602.04602f, 13.246f), SCROLL_AIRPORT_DOORS, 0.0, -0.1706, 0.107, 0, 255, 0, 0.11); - aScrollBars[4].Init(CVector(-1089.61f, -619.81702f, 13.246f), SCROLL_AIRPORT_DOORS, 0.0, -0.1706, 0.107, 255, 128, 0, 0.11); - aScrollBars[5].Init(CVector(-754.578f, -633.50897f, 18.411f), SCROLL_AIRPORT_FRONT, 0.0, 0.591, 0.52, 100, 100, 255, 0.3); - aScrollBars[6].Init(CVector( -754.578f, -586.672f, 18.411f), SCROLL_AIRPORT_FRONT, 0.0, 0.591, 0.52, 100, 100, 255, 0.3); - aScrollBars[7].Init(CVector( 85.473f, -1069.512f, 30.5f ), SCROLL_STORE, 0.625, -0.3125, 0.727, 100, 100, 255, 0.5); - aScrollBars[8].Init(CVector( 74.823f, -1086.879f, 31.495f), SCROLL_ENTERTAINMENT, -0.2083, 0.1041, 0.5, 255, 255, 128, 0.3); - aScrollBars[9].Init(CVector( -36.459f, -1031.2371f, 32.534f), SCROLL_ENTERTAINMENT, -0.1442, 0.0721, 0.229, 150, 255, 50, 0.3); - aScrollBars[10].Init(CVector( 1208.0f, -62.208f, 19.157f), SCROLL_USED_CARS, 0.0642, -0.20365, 0.229, 255, 128, 0, 0.3); + aScrollBars[0].Init(CVector( 228.3f, -669.0f, 39.0f ), SCROLL_BUSINESS, 0.0f, 0.5f, 0.5f, 255, 128, 0, 0.3f); + aScrollBars[1].Init(CVector( 772.0f, 164.0f, -9.5f ), SCROLL_TRAFFIC, 0.0f, 0.5f, 0.25f, 128, 255, 0, 0.3f); + aScrollBars[2].Init(CVector(-1089.61f, -584.224f, 13.246f), SCROLL_AIRPORT_DOORS, 0.0f, -0.1706f, 0.107f, 255, 0, 0, 0.11f); + aScrollBars[3].Init(CVector(-1089.61f, -602.04602f, 13.246f), SCROLL_AIRPORT_DOORS, 0.0f, -0.1706f, 0.107f, 0, 255, 0, 0.11f); + aScrollBars[4].Init(CVector(-1089.61f, -619.81702f, 13.246f), SCROLL_AIRPORT_DOORS, 0.0f, -0.1706f, 0.107f, 255, 128, 0, 0.11f); + aScrollBars[5].Init(CVector(-754.578f, -633.50897f, 18.411f), SCROLL_AIRPORT_FRONT, 0.0f, 0.591f, 0.52f, 100, 100, 255, 0.3f); + aScrollBars[6].Init(CVector( -754.578f, -586.672f, 18.411f), SCROLL_AIRPORT_FRONT, 0.0f, 0.591f, 0.52f, 100, 100, 255, 0.3f); + aScrollBars[7].Init(CVector( 85.473f, -1069.512f, 30.5f ), SCROLL_STORE, 0.625f, -0.3125f, 0.727f, 100, 100, 255, 0.5f); + aScrollBars[8].Init(CVector( 74.823f, -1086.879f, 31.495f), SCROLL_ENTERTAINMENT, -0.2083f, 0.1041f, 0.5f, 255, 255, 128, 0.3f); + aScrollBars[9].Init(CVector( -36.459f, -1031.2371f, 32.534f), SCROLL_ENTERTAINMENT, -0.1442f, 0.0721f, 0.229f, 150, 255, 50, 0.3f); + aScrollBars[10].Init(CVector( 1208.0f, -62.208f, 19.157f), SCROLL_USED_CARS, 0.0642f, -0.20365f, 0.229f, 255, 128, 0, 0.3f); // Initialize tower clocks aTowerClocks[0].Init(CVector(59.4f, -1081.3f, 54.15f), -1.0f, 0.0f, 0, 0, 0, 80.0f, 2.0f); @@ -406,9 +406,9 @@ void CScrollBar::Update() m_pMessage = "KEEP YOUR EYES ON THE ROAD AND NOT ON THIS SIGN "; break; case 4: - if (CWeather::Foggyness > 0.5) + if (CWeather::Foggyness > 0.5f) m_pMessage = "POOR VISIBILITY ! "; - else if (CWeather::WetRoads > 0.5) + else if (CWeather::WetRoads > 0.5f) m_pMessage = "ROADS ARE SLIPPERY ! "; else m_pMessage = "ENJOY YOUR TRIP "; @@ -562,7 +562,7 @@ void CScrollBar::Update() "ONE FOR ALL THE FAMILY. . . "; break; case 9: - m_pMessage = (char*)FindTimeMessage(); + m_pMessage = FindTimeMessage(); break; } } @@ -686,7 +686,7 @@ void CScrollBar::Render() r / 2, g / 2, b / 2, - 255, 1.0 / screenCoord.z, 255); + 255, 1.0f / screenCoord.z, 255); } } } @@ -849,11 +849,11 @@ void CDigitalClock::Render() { CSprite::RenderBufferedOneXLUSprite( screenCoord.x, screenCoord.y, screenCoord.z, - screenW * m_fScale * 0.12, - screenW * m_fScale * 0.12, + screenW * m_fScale * 0.12f, + screenW * m_fScale * 0.12f, r, g, b, 255, - 1.0 / screenCoord.z, + 1.0f / screenCoord.z, 255); } } @@ -891,4 +891,4 @@ InjectHook(0x5001D0, &CTowerClock::Render, PATCH_JUMP); InjectHook(0x5004F0, &CDigitalClock::Init, PATCH_JUMP); InjectHook(0x500550, &CDigitalClock::Update, PATCH_JUMP); InjectHook(0x5005F0, &CDigitalClock::Render, PATCH_JUMP); -ENDPATCHES
\ No newline at end of file +ENDPATCHES diff --git a/src/render/Font.cpp b/src/render/Font.cpp index 2d059516..7a16ad03 100644 --- a/src/render/Font.cpp +++ b/src/render/Font.cpp @@ -84,7 +84,7 @@ CFont::Initialise(void) Sprite[2].SetTexture("font1", "font1_mask"); SetScale(1.0f, 1.0f); SetSlantRefPoint(SCREEN_WIDTH, 0.0f); - SetSlant(0.0); + SetSlant(0.0f); SetColor(CRGBA(0xFF, 0xFF, 0xFF, 0)); SetJustifyOff(); SetCentreOff(); @@ -95,7 +95,7 @@ CFont::Initialise(void) SetBackGroundOnlyTextOff(); SetPropOn(); SetFontStyle(0); - SetRightJustifyWrap(0.0); + SetRightJustifyWrap(0.0f); SetAlphaFade(255.0f); SetDropShadowPosition(0); CTxdStore::PopCurrentTxd(); diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp index b87f7c71..f0134062 100644 --- a/src/render/Hud.cpp +++ b/src/render/Hud.cpp @@ -611,15 +611,15 @@ void CHud::Draw() /* DrawClock */ - CFont::SetJustifyOff();
- CFont::SetCentreOff();
- CFont::SetBackgroundOff();
- CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
- CFont::SetBackGroundOnlyTextOff();
- CFont::SetPropOff();
- CFont::SetFontStyle(FONT_HEADING);
- CFont::SetRightJustifyOn();
- CFont::SetRightJustifyWrap(0.0); + CFont::SetJustifyOff(); + CFont::SetCentreOff(); + CFont::SetBackgroundOff(); + CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f)); + CFont::SetBackGroundOnlyTextOff(); + CFont::SetPropOff(); + CFont::SetFontStyle(FONT_HEADING); + CFont::SetRightJustifyOn(); + CFont::SetRightJustifyWrap(0.0f); sprintf(sTemp, "%02d:%02d", CClock::GetHours(), CClock::GetMinutes()); AsciiToUnicode(sTemp, sPrint); @@ -702,21 +702,21 @@ void CHud::Draw() AsciiToUnicode(CUserDisplay::OnscnTimer.m_sEntries[0].m_bCounterBuffer, sTimer); CFont::SetPropOn(); - CFont::SetBackgroundOff();
- CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
- CFont::SetCentreOff();
- CFont::SetRightJustifyOn();
- CFont::SetRightJustifyWrap(0.0f);
+ CFont::SetBackgroundOff(); + CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f)); + CFont::SetCentreOff(); + CFont::SetRightJustifyOn(); + CFont::SetRightJustifyWrap(0.0f); CFont::SetFontStyle(FONT_HEADING); - CFont::SetColor(CRGBA(244, 20, 20, 255));
- CFont::SetWrapx(SCREEN_SCALE_X(640.0f));
- CFont::SetPropOff();
+ CFont::SetColor(CRGBA(244, 20, 20, 255)); + CFont::SetWrapx(SCREEN_SCALE_X(640.0f)); + CFont::SetPropOff(); CFont::SetBackGroundOnlyTextOn(); - CFont::SetColor(CRGBA(0, 0, 0, 255));
+ CFont::SetColor(CRGBA(0, 0, 0, 255)); CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(TIMER_RIGHT_OFFSET) + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_Y(132.0f) + SCREEN_SCALE_Y(2.0f), sTimer); - CFont::SetColor(CRGBA(0, 106, 164, 255));
+ CFont::SetColor(CRGBA(0, 106, 164, 255)); CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(TIMER_RIGHT_OFFSET), SCREEN_SCALE_Y(132.0f), sTimer); } else { int counter = atoi(CUserDisplay::OnscnTimer.m_sEntries[0].m_bCounterBuffer); @@ -728,7 +728,7 @@ void CHud::Draw() } if (CUserDisplay::OnscnTimer.m_sEntries[0].m_aCounterText[0]) { - CFont::SetPropOn();
+ CFont::SetPropOn(); CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f)); CFont::SetColor(CRGBA(0, 0, 0, 255)); CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(TIMER_RIGHT_OFFSET) - SCREEN_SCALE_X(61.0f) + SCREEN_SCALE_Y(2.0f), SCREEN_SCALE_Y(132.0f) + SCREEN_SCALE_Y(2.0f), TheText.Get(CUserDisplay::OnscnTimer.m_sEntries[0].m_aCounterText)); @@ -773,7 +773,7 @@ void CHud::Draw() fStep = 2.0f; PagerXOffset += fStep * CTimer::GetTimeStep(); if (PagerXOffset > 150.0f) { - PagerXOffset = 150.0; + PagerXOffset = 150.0f; PagerOn = 0; } } @@ -934,13 +934,13 @@ void CHud::Draw() BigMessageInUse[0] += CTimer::GetTimeStep(); if (BigMessageInUse[0] >= 120.0f) { - BigMessageInUse[0] = 120.0; + BigMessageInUse[0] = 120.0f; BigMessageAlpha[0] -= (CTimer::GetTimeStepInMilliseconds() * 0.3f); } if (BigMessageAlpha[0] <= 0.0f) { m_BigMessage[0][0] = 0; - BigMessageAlpha[0] = 0.0; + BigMessageAlpha[0] = 0.0f; } } else { @@ -977,7 +977,7 @@ void CHud::Draw() BigMessageAlpha[2] += (CTimer::GetTimeStepInSeconds() * 255.0f); if (BigMessageAlpha[2] > 255.0f) - BigMessageAlpha[2] = 255.0; + BigMessageAlpha[2] = 255.0f; CFont::SetBackgroundOff(); @@ -997,12 +997,12 @@ void CHud::Draw() CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(82.0f), m_BigMessage[2]); } else { - BigMessageAlpha[2] = 0.0; - BigMessageInUse[2] = 1.0; + BigMessageAlpha[2] = 0.0f; + BigMessageInUse[2] = 1.0f; } } else { - BigMessageInUse[2] = 0.0; + BigMessageInUse[2] = 0.0f; } } } @@ -1231,12 +1231,12 @@ void CHud::DrawAfterFade() BigMessageInUse[1] += CTimer::GetTimeStep(); if (BigMessageInUse[1] >= 120.0f) { - BigMessageInUse[1] = 120.0; + BigMessageInUse[1] = 120.0f; BigMessageAlpha[1] -= (CTimer::GetTimeStepInMilliseconds() * 0.3f); } if (BigMessageAlpha[1] <= 0) { m_BigMessage[1][0] = 0; - BigMessageAlpha[1] = 0.0; + BigMessageAlpha[1] = 0.0f; } } else { diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp index 804fedf5..8ec2d9a1 100644 --- a/src/render/SpecialFX.cpp +++ b/src/render/SpecialFX.cpp @@ -116,47 +116,47 @@ void CBulletTrace::Update(void) WRAPPER void CBrightLights::RegisterOne(CVector pos, CVector up, CVector right, CVector fwd, uint8 type, uint8 unk1, uint8 unk2, uint8 unk3) { EAXJMP(0x51A410); } -RpAtomic *
-MarkerAtomicCB(RpAtomic *atomic, void *data)
-{
- *(RpAtomic**)data = atomic;
- return atomic;
+RpAtomic * +MarkerAtomicCB(RpAtomic *atomic, void *data) +{ + *(RpAtomic**)data = atomic; + return atomic; } -bool
-C3dMarker::AddMarker(uint32 identifier, uint16 type, float fSize, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate)
-{
- m_nIdentifier = identifier;
-
- m_Matrix.SetUnity();
-
- RpAtomic *origAtomic;
- origAtomic = nil;
- RpClumpForAllAtomics(C3dMarkers::m_pRpClumpArray[type], MarkerAtomicCB, &origAtomic);
-
- RpAtomic *atomic = RpAtomicClone(origAtomic);
- RwFrame *frame = RwFrameCreate();
- RpAtomicSetFrame(atomic, frame);
- CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
-
- RpGeometry *geometry = RpAtomicGetGeometry(atomic);
- RpGeometrySetFlags(geometry, RpGeometryGetFlags(geometry) | rpGEOMETRYMODULATEMATERIALCOLOR);
-
- m_pAtomic = atomic;
- m_Matrix.Attach(RwFrameGetMatrix(RpAtomicGetFrame(m_pAtomic)));
- m_pMaterial = RpGeometryGetMaterial(geometry, 0);
- m_fSize = fSize;
- m_fStdSize = m_fSize;
- m_Color.red = r;
- m_Color.green = g;
- m_Color.blue = b;
- m_Color.alpha = a;
- m_nPulsePeriod = pulsePeriod;
- m_fPulseFraction = pulseFraction;
- m_nRotateRate = rotateRate;
- m_nStartTime = CTimer::GetTimeInMilliseconds();
- m_nType = type;
- return m_pAtomic != nil;
+bool +C3dMarker::AddMarker(uint32 identifier, uint16 type, float fSize, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate) +{ + m_nIdentifier = identifier; + + m_Matrix.SetUnity(); + + RpAtomic *origAtomic; + origAtomic = nil; + RpClumpForAllAtomics(C3dMarkers::m_pRpClumpArray[type], MarkerAtomicCB, &origAtomic); + + RpAtomic *atomic = RpAtomicClone(origAtomic); + RwFrame *frame = RwFrameCreate(); + RpAtomicSetFrame(atomic, frame); + CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil); + + RpGeometry *geometry = RpAtomicGetGeometry(atomic); + RpGeometrySetFlags(geometry, RpGeometryGetFlags(geometry) | rpGEOMETRYMODULATEMATERIALCOLOR); + + m_pAtomic = atomic; + m_Matrix.Attach(RwFrameGetMatrix(RpAtomicGetFrame(m_pAtomic))); + m_pMaterial = RpGeometryGetMaterial(geometry, 0); + m_fSize = fSize; + m_fStdSize = m_fSize; + m_Color.red = r; + m_Color.green = g; + m_Color.blue = b; + m_Color.alpha = a; + m_nPulsePeriod = pulsePeriod; + m_fPulseFraction = pulseFraction; + m_nRotateRate = rotateRate; + m_nStartTime = CTimer::GetTimeInMilliseconds(); + m_nType = type; + return m_pAtomic != nil; } void @@ -164,238 +164,238 @@ C3dMarker::DeleteMarkerObject() { RwFrame *frame; - m_nIdentifier = 0;
- m_nStartTime = 0;
- m_bIsUsed = false;
- m_nType = MARKERTYPE_INVALID;
-
- frame = RpAtomicGetFrame(m_pAtomic);
- RpAtomicDestroy(m_pAtomic);
- RwFrameDestroy(frame);
+ m_nIdentifier = 0; + m_nStartTime = 0; + m_bIsUsed = false; + m_nType = MARKERTYPE_INVALID; + + frame = RpAtomicGetFrame(m_pAtomic); + RpAtomicDestroy(m_pAtomic); + RwFrameDestroy(frame); m_pAtomic = nil; } -void
-C3dMarker::Render()
-{
- if (m_pAtomic == nil) return;
-
- RwRGBA *color = RpMaterialGetColor(m_pMaterial);
- *color = m_Color;
-
- m_Matrix.UpdateRW();
-
- CMatrix matrix;
- matrix.Attach(m_Matrix.m_attachment);
- matrix.Scale(m_fSize);
- matrix.UpdateRW();
-
- RwFrameUpdateObjects(RpAtomicGetFrame(m_pAtomic));
- SetBrightMarkerColours(m_fBrightness);
- if (m_nType != MARKERTYPE_ARROW)
- RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
- RpAtomicRender(m_pAtomic);
- if (m_nType != MARKERTYPE_ARROW)
- RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
- ReSetAmbientAndDirectionalColours();
+void +C3dMarker::Render() +{ + if (m_pAtomic == nil) return; + + RwRGBA *color = RpMaterialGetColor(m_pMaterial); + *color = m_Color; + + m_Matrix.UpdateRW(); + + CMatrix matrix; + matrix.Attach(m_Matrix.m_attachment); + matrix.Scale(m_fSize); + matrix.UpdateRW(); + + RwFrameUpdateObjects(RpAtomicGetFrame(m_pAtomic)); + SetBrightMarkerColours(m_fBrightness); + if (m_nType != MARKERTYPE_ARROW) + RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE); + RpAtomicRender(m_pAtomic); + if (m_nType != MARKERTYPE_ARROW) + RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE); + ReSetAmbientAndDirectionalColours(); } C3dMarker(&C3dMarkers::m_aMarkerArray)[NUM3DMARKERS] = *(C3dMarker(*)[NUM3DMARKERS])*(uintptr*)0x72D408; int32 &C3dMarkers::NumActiveMarkers = *(int32*)0x8F2A08; RpClump* (&C3dMarkers::m_pRpClumpArray)[NUMMARKERTYPES] = *(RpClump*(*)[NUMMARKERTYPES])*(uintptr*)0x8E2888; -void
-C3dMarkers::Init()
-{
- for (int i = 0; i < NUM3DMARKERS; i++) {
- m_aMarkerArray[i].m_pAtomic = nil;
- m_aMarkerArray[i].m_nType = MARKERTYPE_INVALID;
- m_aMarkerArray[i].m_bIsUsed = false;
- m_aMarkerArray[i].m_nIdentifier = 0;
- m_aMarkerArray[i].m_Color.red = 255;
- m_aMarkerArray[i].m_Color.green = 255;
- m_aMarkerArray[i].m_Color.blue = 255;
- m_aMarkerArray[i].m_Color.alpha = 255;
- m_aMarkerArray[i].m_nPulsePeriod = 1024;
- m_aMarkerArray[i].m_nRotateRate = 5;
- m_aMarkerArray[i].m_nStartTime = 0;
- m_aMarkerArray[i].m_fPulseFraction = 0.25f;
- m_aMarkerArray[i].m_fStdSize = 1.0f;
- m_aMarkerArray[i].m_fSize = 1.0f;
- m_aMarkerArray[i].m_fBrightness = 1.0f;
- m_aMarkerArray[i].m_fCameraRange = 0.0f;
- }
- NumActiveMarkers = 0;
- int txdSlot = CTxdStore::FindTxdSlot("particle");
- CTxdStore::PushCurrentTxd();
- CTxdStore::SetCurrentTxd(txdSlot);
- CFileMgr::ChangeDir("\\");
- m_pRpClumpArray[MARKERTYPE_ARROW] = CFileLoader::LoadAtomicFile2Return("models/generic/arrow.dff");
- m_pRpClumpArray[MARKERTYPE_CYLINDER] = CFileLoader::LoadAtomicFile2Return("models/generic/zonecylb.dff");
- CTxdStore::PopCurrentTxd();
+void +C3dMarkers::Init() +{ + for (int i = 0; i < NUM3DMARKERS; i++) { + m_aMarkerArray[i].m_pAtomic = nil; + m_aMarkerArray[i].m_nType = MARKERTYPE_INVALID; + m_aMarkerArray[i].m_bIsUsed = false; + m_aMarkerArray[i].m_nIdentifier = 0; + m_aMarkerArray[i].m_Color.red = 255; + m_aMarkerArray[i].m_Color.green = 255; + m_aMarkerArray[i].m_Color.blue = 255; + m_aMarkerArray[i].m_Color.alpha = 255; + m_aMarkerArray[i].m_nPulsePeriod = 1024; + m_aMarkerArray[i].m_nRotateRate = 5; + m_aMarkerArray[i].m_nStartTime = 0; + m_aMarkerArray[i].m_fPulseFraction = 0.25f; + m_aMarkerArray[i].m_fStdSize = 1.0f; + m_aMarkerArray[i].m_fSize = 1.0f; + m_aMarkerArray[i].m_fBrightness = 1.0f; + m_aMarkerArray[i].m_fCameraRange = 0.0f; + } + NumActiveMarkers = 0; + int txdSlot = CTxdStore::FindTxdSlot("particle"); + CTxdStore::PushCurrentTxd(); + CTxdStore::SetCurrentTxd(txdSlot); + CFileMgr::ChangeDir("\\"); + m_pRpClumpArray[MARKERTYPE_ARROW] = CFileLoader::LoadAtomicFile2Return("models/generic/arrow.dff"); + m_pRpClumpArray[MARKERTYPE_CYLINDER] = CFileLoader::LoadAtomicFile2Return("models/generic/zonecylb.dff"); + CTxdStore::PopCurrentTxd(); } -void
-C3dMarkers::Shutdown()
-{
- for (int i = 0; i < NUM3DMARKERS; i++) {
- if (m_aMarkerArray[i].m_pAtomic != nil)
- m_aMarkerArray[i].DeleteMarkerObject();
- }
-
- for (int i = 0; i < NUMMARKERTYPES; i++) {
- if (m_pRpClumpArray[i] != nil)
- RpClumpDestroy(m_pRpClumpArray[i]);
- }
+void +C3dMarkers::Shutdown() +{ + for (int i = 0; i < NUM3DMARKERS; i++) { + if (m_aMarkerArray[i].m_pAtomic != nil) + m_aMarkerArray[i].DeleteMarkerObject(); + } + + for (int i = 0; i < NUMMARKERTYPES; i++) { + if (m_pRpClumpArray[i] != nil) + RpClumpDestroy(m_pRpClumpArray[i]); + } } -void
-C3dMarkers::Render()
-{
- NumActiveMarkers = 0;
- ActivateDirectional();
- for (int i = 0; i < NUM3DMARKERS; i++) {
- if (m_aMarkerArray[i].m_bIsUsed) {
- if (m_aMarkerArray[i].m_fCameraRange < 120.0f)
- m_aMarkerArray[i].Render();
- NumActiveMarkers++;
- m_aMarkerArray[i].m_bIsUsed = false;
- } else if (m_aMarkerArray[i].m_pAtomic != nil) {
- m_aMarkerArray[i].DeleteMarkerObject();
- }
- }
+void +C3dMarkers::Render() +{ + NumActiveMarkers = 0; + ActivateDirectional(); + for (int i = 0; i < NUM3DMARKERS; i++) { + if (m_aMarkerArray[i].m_bIsUsed) { + if (m_aMarkerArray[i].m_fCameraRange < 120.0f) + m_aMarkerArray[i].Render(); + NumActiveMarkers++; + m_aMarkerArray[i].m_bIsUsed = false; + } else if (m_aMarkerArray[i].m_pAtomic != nil) { + m_aMarkerArray[i].DeleteMarkerObject(); + } + } } -C3dMarker *
+C3dMarker * C3dMarkers::PlaceMarker(uint32 identifier, uint16 type, CVector &pos, float size, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate) { - C3dMarker *pMarker;
-
- pMarker = nil;
- float dist = Sqrt((pos.x - FindPlayerCentreOfWorld(0).x) * (pos.x - FindPlayerCentreOfWorld(0).x) + (pos.y - FindPlayerCentreOfWorld(0).y) * (pos.y - FindPlayerCentreOfWorld(0).y));
-
- if (type != MARKERTYPE_ARROW && type != MARKERTYPE_CYLINDER) return nil;
-
- for (int i = 0; i < NUM3DMARKERS; i++) {
- if (!m_aMarkerArray[i].m_bIsUsed && m_aMarkerArray[i].m_nIdentifier == identifier) {
- pMarker = &m_aMarkerArray[i];
- break;
- }
- }
-
- if (pMarker == nil) {
- for (int i = 0; i < NUM3DMARKERS; i++) {
- if (m_aMarkerArray[i].m_nType == MARKERTYPE_INVALID) {
- pMarker = &m_aMarkerArray[i];
- break;
- }
- }
- }
-
- if (pMarker == nil && type == MARKERTYPE_ARROW) {
- for (int i = 0; i < NUM3DMARKERS; i++) {
- if (dist < m_aMarkerArray[i].m_fCameraRange && m_aMarkerArray[i].m_nType == MARKERTYPE_ARROW && (pMarker == nil || m_aMarkerArray[i].m_fCameraRange > pMarker->m_fCameraRange)) {
- pMarker = &m_aMarkerArray[i];
- break;
- }
- }
-
- if (pMarker != nil)
- pMarker->m_nType = MARKERTYPE_INVALID;
- }
-
- if (pMarker == nil) return pMarker;
-
- pMarker->m_fCameraRange = dist;
- if (pMarker->m_nIdentifier == identifier && pMarker->m_nType == type) {
- if (type == MARKERTYPE_ARROW) {
- if (dist < 25.0f) {
- if (dist > 5.0f)
- pMarker->m_fStdSize = size - (25.0f - dist) * (0.3f * size) / 20.0f;
- else
- pMarker->m_fStdSize = size - 0.3f * size;
- } else {
- pMarker->m_fStdSize = size;
- }
- } else if (type == MARKERTYPE_CYLINDER) {
- if (dist < size + 12.0f) {
- if (dist > size + 1.0f)
- pMarker->m_Color.alpha = (1.0f - (size + 12.0f - dist) * 0.7f / 11.0f) * (float)a;
- else
- pMarker->m_Color.alpha = (float)a * 0.3f;
- } else {
- pMarker->m_Color.alpha = a;
- }
- }
- float someSin = Sin(TWOPI * (float)((pMarker->m_nPulsePeriod - 1) & (CTimer::GetTimeInMilliseconds() - pMarker->m_nStartTime)) / (float)pMarker->m_nPulsePeriod);
- pMarker->m_fSize = pMarker->m_fStdSize - pulseFraction * pMarker->m_fStdSize * someSin;
-
- if (type == MARKERTYPE_ARROW) {
- pos.z += 0.25f * pMarker->m_fStdSize * someSin;
- } else if (type == MARKERTYPE_0) {
- if (someSin > 0.0f)
- pMarker->m_Color.alpha = (float)a * 0.7f * someSin + a;
- else
- pMarker->m_Color.alpha = (float)a * 0.4f * someSin + a;
- }
- if (pMarker->m_nRotateRate) {
- RwV3d pos = pMarker->m_Matrix.m_matrix.pos;
- pMarker->m_Matrix.RotateZ(DEGTORAD(pMarker->m_nRotateRate * CTimer::GetTimeStep()));
- pMarker->m_Matrix.GetPosition() = pos;
- }
- if (type == MARKERTYPE_ARROW)
- pMarker->m_Matrix.GetPosition() = pos;
- pMarker->m_bIsUsed = true;
- return pMarker;
- }
-
- if (pMarker->m_nIdentifier != 0)
- pMarker->DeleteMarkerObject();
-
- pMarker->AddMarker(identifier, type, size, r, g, b, a, pulsePeriod, pulseFraction, rotateRate);
- if (type == MARKERTYPE_CYLINDER || type == MARKERTYPE_0 || type == MARKERTYPE_2) {
- float z = CWorld::FindGroundZFor3DCoord(pos.x, pos.y, pos.z + 1.0f, nil);
- if (z != 0.0f)
- pos.z = z - 0.05f * size;
- }
- pMarker->m_Matrix.SetTranslate(pos.x, pos.y, pos.z);
- if (type == MARKERTYPE_2) {
- pMarker->m_Matrix.RotateX(PI);
- pMarker->m_Matrix.GetPosition() = pos;
- }
- pMarker->m_Matrix.UpdateRW();
- if (type == MARKERTYPE_ARROW) {
- if (dist < 25.0f) {
- if (dist > 5.0f)
- pMarker->m_fStdSize = size - (25.0f - dist) * (0.3f * size) / 20.0f;
- else
- pMarker->m_fStdSize = size - 0.3f * size;
- } else {
- pMarker->m_fStdSize = size;
- }
- } else if (type == MARKERTYPE_CYLINDER) {
- if (dist < size + 12.0f) {
- if (dist > size + 1.0f)
- pMarker->m_Color.alpha = (1.0f - (size + 12.0f - dist) * 0.7f / 11.0f) * (float)a;
- else
- pMarker->m_Color.alpha = (float)a * 0.3f;
- } else {
- pMarker->m_Color.alpha = a;
- }
- }
- pMarker->m_bIsUsed = true;
+ C3dMarker *pMarker; + + pMarker = nil; + float dist = Sqrt((pos.x - FindPlayerCentreOfWorld(0).x) * (pos.x - FindPlayerCentreOfWorld(0).x) + (pos.y - FindPlayerCentreOfWorld(0).y) * (pos.y - FindPlayerCentreOfWorld(0).y)); + + if (type != MARKERTYPE_ARROW && type != MARKERTYPE_CYLINDER) return nil; + + for (int i = 0; i < NUM3DMARKERS; i++) { + if (!m_aMarkerArray[i].m_bIsUsed && m_aMarkerArray[i].m_nIdentifier == identifier) { + pMarker = &m_aMarkerArray[i]; + break; + } + } + + if (pMarker == nil) { + for (int i = 0; i < NUM3DMARKERS; i++) { + if (m_aMarkerArray[i].m_nType == MARKERTYPE_INVALID) { + pMarker = &m_aMarkerArray[i]; + break; + } + } + } + + if (pMarker == nil && type == MARKERTYPE_ARROW) { + for (int i = 0; i < NUM3DMARKERS; i++) { + if (dist < m_aMarkerArray[i].m_fCameraRange && m_aMarkerArray[i].m_nType == MARKERTYPE_ARROW && (pMarker == nil || m_aMarkerArray[i].m_fCameraRange > pMarker->m_fCameraRange)) { + pMarker = &m_aMarkerArray[i]; + break; + } + } + + if (pMarker != nil) + pMarker->m_nType = MARKERTYPE_INVALID; + } + + if (pMarker == nil) return pMarker; + + pMarker->m_fCameraRange = dist; + if (pMarker->m_nIdentifier == identifier && pMarker->m_nType == type) { + if (type == MARKERTYPE_ARROW) { + if (dist < 25.0f) { + if (dist > 5.0f) + pMarker->m_fStdSize = size - (25.0f - dist) * (0.3f * size) / 20.0f; + else + pMarker->m_fStdSize = size - 0.3f * size; + } else { + pMarker->m_fStdSize = size; + } + } else if (type == MARKERTYPE_CYLINDER) { + if (dist < size + 12.0f) { + if (dist > size + 1.0f) + pMarker->m_Color.alpha = (1.0f - (size + 12.0f - dist) * 0.7f / 11.0f) * (float)a; + else + pMarker->m_Color.alpha = (float)a * 0.3f; + } else { + pMarker->m_Color.alpha = a; + } + } + float someSin = Sin(TWOPI * (float)((pMarker->m_nPulsePeriod - 1) & (CTimer::GetTimeInMilliseconds() - pMarker->m_nStartTime)) / (float)pMarker->m_nPulsePeriod); + pMarker->m_fSize = pMarker->m_fStdSize - pulseFraction * pMarker->m_fStdSize * someSin; + + if (type == MARKERTYPE_ARROW) { + pos.z += 0.25f * pMarker->m_fStdSize * someSin; + } else if (type == MARKERTYPE_0) { + if (someSin > 0.0f) + pMarker->m_Color.alpha = (float)a * 0.7f * someSin + a; + else + pMarker->m_Color.alpha = (float)a * 0.4f * someSin + a; + } + if (pMarker->m_nRotateRate) { + RwV3d pos = pMarker->m_Matrix.m_matrix.pos; + pMarker->m_Matrix.RotateZ(DEGTORAD(pMarker->m_nRotateRate * CTimer::GetTimeStep())); + pMarker->m_Matrix.GetPosition() = pos; + } + if (type == MARKERTYPE_ARROW) + pMarker->m_Matrix.GetPosition() = pos; + pMarker->m_bIsUsed = true; + return pMarker; + } + + if (pMarker->m_nIdentifier != 0) + pMarker->DeleteMarkerObject(); + + pMarker->AddMarker(identifier, type, size, r, g, b, a, pulsePeriod, pulseFraction, rotateRate); + if (type == MARKERTYPE_CYLINDER || type == MARKERTYPE_0 || type == MARKERTYPE_2) { + float z = CWorld::FindGroundZFor3DCoord(pos.x, pos.y, pos.z + 1.0f, nil); + if (z != 0.0f) + pos.z = z - 0.05f * size; + } + pMarker->m_Matrix.SetTranslate(pos.x, pos.y, pos.z); + if (type == MARKERTYPE_2) { + pMarker->m_Matrix.RotateX(PI); + pMarker->m_Matrix.GetPosition() = pos; + } + pMarker->m_Matrix.UpdateRW(); + if (type == MARKERTYPE_ARROW) { + if (dist < 25.0f) { + if (dist > 5.0f) + pMarker->m_fStdSize = size - (25.0f - dist) * (0.3f * size) / 20.0f; + else + pMarker->m_fStdSize = size - 0.3f * size; + } else { + pMarker->m_fStdSize = size; + } + } else if (type == MARKERTYPE_CYLINDER) { + if (dist < size + 12.0f) { + if (dist > size + 1.0f) + pMarker->m_Color.alpha = (1.0f - (size + 12.0f - dist) * 0.7f / 11.0f) * (float)a; + else + pMarker->m_Color.alpha = (float)a * 0.3f; + } else { + pMarker->m_Color.alpha = a; + } + } + pMarker->m_bIsUsed = true; return pMarker; } -void
-C3dMarkers::PlaceMarkerSet(uint32 id, uint16 type, CVector &pos, float size, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate)
-{
- PlaceMarker(id, type, pos, size, r, g, b, a, pulsePeriod, pulseFraction, 1);
- PlaceMarker(id, type, pos, size * 0.93f, r, g, b, a, pulsePeriod, pulseFraction, 2);
- PlaceMarker(id, type, pos, size * 0.86f, r, g, b, a, pulsePeriod, pulseFraction, -1);
+void +C3dMarkers::PlaceMarkerSet(uint32 id, uint16 type, CVector &pos, float size, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate) +{ + PlaceMarker(id, type, pos, size, r, g, b, a, pulsePeriod, pulseFraction, 1); + PlaceMarker(id, type, pos, size * 0.93f, r, g, b, a, pulsePeriod, pulseFraction, 2); + PlaceMarker(id, type, pos, size * 0.86f, r, g, b, a, pulsePeriod, pulseFraction, -1); } -
+ void C3dMarkers::Update() { @@ -403,151 +403,151 @@ C3dMarkers::Update() #define MONEY_MESSAGE_LIFETIME_MS 2000 -CMoneyMessage CMoneyMessages::aMoneyMessages[NUMMONEYMESSAGES];
-
-void
-CMoneyMessage::Render()
-{
- const float MAX_SCALE = 4.0f;
- uint32 nLifeTime = CTimer::GetTimeInMilliseconds() - m_nTimeRegistered;
- if (nLifeTime >= MONEY_MESSAGE_LIFETIME_MS) m_nTimeRegistered = 0;
- else {
- float fLifeTime = (float)nLifeTime / MONEY_MESSAGE_LIFETIME_MS;
- RwV3d vecOut;
- float fDistX, fDistY;
- if (CSprite::CalcScreenCoors(m_vecPosition + CVector(0.0f, 0.0f, fLifeTime), &vecOut, &fDistX, &fDistY, true)) {
- fDistX *= (0.7 * fLifeTime + 2.0) * m_fSize;
- fDistY *= (0.7 * fLifeTime + 2.0) * m_fSize;
- CFont::SetPropOn();
- CFont::SetBackgroundOff();
-
- float fScaleY = fDistY / 100.0f;
- if (fScaleY > MAX_SCALE) fScaleY = MAX_SCALE;
-
- float fScaleX = fDistX / 100.0f;
- if (fScaleX > MAX_SCALE) fScaleX = MAX_SCALE;
-
- CFont::SetScale(fScaleX, fScaleY); // maybe use SCREEN_SCALE_X and SCREEN_SCALE_Y here?
- CFont::SetCentreOn();
- CFont::SetCentreSize(SCREEN_WIDTH);
- CFont::SetJustifyOff();
- CFont::SetColor(CRGBA(m_Colour.r, m_Colour.g, m_Colour.b, (255.0f - 255.0f * fLifeTime) * m_fOpacity));
- CFont::SetBackGroundOnlyTextOff();
- CFont::SetFontStyle(FONT_BANK);
- CFont::PrintString(vecOut.x, vecOut.y, m_aText);
- }
- }
-}
-
-void
-CMoneyMessages::Init()
-{
- for (int32 i = 0; i < NUMMONEYMESSAGES; i++)
- aMoneyMessages[i].m_nTimeRegistered = 0;
-}
-
-void
-CMoneyMessages::Render()
-{
- for (int32 i = 0; i < NUMMONEYMESSAGES; i++) {
- if (aMoneyMessages[i].m_nTimeRegistered != 0)
- aMoneyMessages[i].Render();
- }
-}
-
-void
-CMoneyMessages::RegisterOne(CVector vecPos, const char *pText, uint8 bRed, uint8 bGreen, uint8 bBlue, float fSize, float fOpacity)
-{
- uint32 nIndex = 0;
- while (aMoneyMessages[nIndex].m_nTimeRegistered != 0) {
- if (++nIndex >= NUMMONEYMESSAGES) return;
- }
-
- // Add data of this money message to the array
- AsciiToUnicode(pText, aMoneyMessages[nIndex].m_aText);
-
- aMoneyMessages[nIndex].m_nTimeRegistered = CTimer::GetTimeInMilliseconds();
- aMoneyMessages[nIndex].m_vecPosition = vecPos;
- aMoneyMessages[nIndex].m_Colour.red = bRed;
- aMoneyMessages[nIndex].m_Colour.green = bGreen;
- aMoneyMessages[nIndex].m_Colour.blue = bBlue;
- aMoneyMessages[nIndex].m_fSize = fSize;
- aMoneyMessages[nIndex].m_fOpacity = fOpacity;
-}
-
-CRGBA FoamColour(255, 255, 255, 255);
-unsigned int CSpecialParticleStuff::BoatFromStart;
-
-void
-CSpecialParticleStuff::CreateFoamAroundObject(CMatrix* pMatrix, float innerFw, float innerRg, float innerUp, int32 particles)
-{
- float outerFw = innerFw + 5.0f;
- float outerRg = innerRg + 5.0f;
- float outerUp = innerUp + 5.0f;
- for (int attempts = 0; particles > 0 && attempts < 1000; attempts++) {
- CVector pos;
- int rnd = CGeneral::GetRandomNumber();
- pos.x = (int8)(rnd - 128) * innerFw / 110.0f;
- pos.y = (int8)((rnd >> 8) - 128) * innerFw / 110.0f;
- pos.z = 0.0f;
- if (DotProduct2D(pos, TheCamera.GetForward()) >= 0)
- continue;
- // was there any point in adding it here?
- pos += pMatrix->GetPosition();
- pos.z = 2.0f;
- float fw = Abs(DotProduct(pMatrix->GetForward(), pos - pMatrix->GetPosition()));
- if (fw >= outerFw)
- continue;
- float rg = Abs(DotProduct(pMatrix->GetRight(), pos - pMatrix->GetPosition()));
- if (rg >= outerRg)
- continue;
- float up = Abs(DotProduct(pMatrix->GetUp(), pos - pMatrix->GetPosition()));
- if (up >= outerUp)
- continue;
- if (fw > innerFw || rg > innerRg || up > innerUp) {
- CParticle::AddParticle(PARTICLE_STEAM2, pos, CVector(0.0f, 0.0f, 0.0f), nil, 4.0f, FoamColour, 1, 0, 0, 0);
- particles--;
- }
- }
-}
-
-void
-CSpecialParticleStuff::StartBoatFoamAnimation()
-{
- BoatFromStart = CTimer::GetTimeInMilliseconds();
-}
-
-void
-CSpecialParticleStuff::UpdateBoatFoamAnimation(CMatrix* pMatrix)
-{
- static int32 FrameInAnimation = 0;
- static float X, Y, Z, dX, dY, dZ;
- CreateFoamAroundObject(pMatrix, 107.0f, 24.1f, 30.5f, 2);
- uint32 prev = CTimer::GetPreviousTimeInMilliseconds();
- uint32 cur = CTimer::GetTimeInMilliseconds();
- if (FrameInAnimation != 0) {
- X += dX;
- Y += dY;
- Z += dZ;
- CVector pos = *pMatrix * CVector(X, Y, Z);
- CParticle::AddParticle(PARTICLE_STEAM_NY, pos, CVector(0.0f, 0.0f, 0.0f),
- nil, FrameInAnimation * 0.5f + 2.0f, FoamColour, 1, 0, 0, 0);
- if (++FrameInAnimation > 15)
- FrameInAnimation = 0;
- }
- if ((cur & 0x3FF) < (prev & 0x3FF)) {
- FrameInAnimation = 1;
- int rnd = CGeneral::GetRandomNumber();
- X = (int8)(rnd - 128) * 0.2f;
- Y = (int8)((rnd >> 8) - 128) * 0.2f;
- Z = 10.0f;
- rnd = CGeneral::GetRandomNumber();
- dX = (int8)(rnd - 128) * 0.02f;
- dY = (int8)((rnd >> 8) - 128) * 0.02f;
- dZ = 2.0f;
- }
-}
-
+CMoneyMessage CMoneyMessages::aMoneyMessages[NUMMONEYMESSAGES]; + +void +CMoneyMessage::Render() +{ + const float MAX_SCALE = 4.0f; + uint32 nLifeTime = CTimer::GetTimeInMilliseconds() - m_nTimeRegistered; + if (nLifeTime >= MONEY_MESSAGE_LIFETIME_MS) m_nTimeRegistered = 0; + else { + float fLifeTime = (float)nLifeTime / MONEY_MESSAGE_LIFETIME_MS; + RwV3d vecOut; + float fDistX, fDistY; + if (CSprite::CalcScreenCoors(m_vecPosition + CVector(0.0f, 0.0f, fLifeTime), &vecOut, &fDistX, &fDistY, true)) { + fDistX *= (0.7 * fLifeTime + 2.0) * m_fSize; + fDistY *= (0.7 * fLifeTime + 2.0) * m_fSize; + CFont::SetPropOn(); + CFont::SetBackgroundOff(); + + float fScaleY = fDistY / 100.0f; + if (fScaleY > MAX_SCALE) fScaleY = MAX_SCALE; + + float fScaleX = fDistX / 100.0f; + if (fScaleX > MAX_SCALE) fScaleX = MAX_SCALE; + + CFont::SetScale(fScaleX, fScaleY); // maybe use SCREEN_SCALE_X and SCREEN_SCALE_Y here? + CFont::SetCentreOn(); + CFont::SetCentreSize(SCREEN_WIDTH); + CFont::SetJustifyOff(); + CFont::SetColor(CRGBA(m_Colour.r, m_Colour.g, m_Colour.b, (255.0f - 255.0f * fLifeTime) * m_fOpacity)); + CFont::SetBackGroundOnlyTextOff(); + CFont::SetFontStyle(FONT_BANK); + CFont::PrintString(vecOut.x, vecOut.y, m_aText); + } + } +} + +void +CMoneyMessages::Init() +{ + for (int32 i = 0; i < NUMMONEYMESSAGES; i++) + aMoneyMessages[i].m_nTimeRegistered = 0; +} + +void +CMoneyMessages::Render() +{ + for (int32 i = 0; i < NUMMONEYMESSAGES; i++) { + if (aMoneyMessages[i].m_nTimeRegistered != 0) + aMoneyMessages[i].Render(); + } +} + +void +CMoneyMessages::RegisterOne(CVector vecPos, const char *pText, uint8 bRed, uint8 bGreen, uint8 bBlue, float fSize, float fOpacity) +{ + uint32 nIndex = 0; + while (aMoneyMessages[nIndex].m_nTimeRegistered != 0) { + if (++nIndex >= NUMMONEYMESSAGES) return; + } + + // Add data of this money message to the array + AsciiToUnicode(pText, aMoneyMessages[nIndex].m_aText); + + aMoneyMessages[nIndex].m_nTimeRegistered = CTimer::GetTimeInMilliseconds(); + aMoneyMessages[nIndex].m_vecPosition = vecPos; + aMoneyMessages[nIndex].m_Colour.red = bRed; + aMoneyMessages[nIndex].m_Colour.green = bGreen; + aMoneyMessages[nIndex].m_Colour.blue = bBlue; + aMoneyMessages[nIndex].m_fSize = fSize; + aMoneyMessages[nIndex].m_fOpacity = fOpacity; +} + +CRGBA FoamColour(255, 255, 255, 255); +unsigned int CSpecialParticleStuff::BoatFromStart; + +void +CSpecialParticleStuff::CreateFoamAroundObject(CMatrix* pMatrix, float innerFw, float innerRg, float innerUp, int32 particles) +{ + float outerFw = innerFw + 5.0f; + float outerRg = innerRg + 5.0f; + float outerUp = innerUp + 5.0f; + for (int attempts = 0; particles > 0 && attempts < 1000; attempts++) { + CVector pos; + int rnd = CGeneral::GetRandomNumber(); + pos.x = (int8)(rnd - 128) * innerFw / 110.0f; + pos.y = (int8)((rnd >> 8) - 128) * innerFw / 110.0f; + pos.z = 0.0f; + if (DotProduct2D(pos, TheCamera.GetForward()) >= 0) + continue; + // was there any point in adding it here? + pos += pMatrix->GetPosition(); + pos.z = 2.0f; + float fw = Abs(DotProduct(pMatrix->GetForward(), pos - pMatrix->GetPosition())); + if (fw >= outerFw) + continue; + float rg = Abs(DotProduct(pMatrix->GetRight(), pos - pMatrix->GetPosition())); + if (rg >= outerRg) + continue; + float up = Abs(DotProduct(pMatrix->GetUp(), pos - pMatrix->GetPosition())); + if (up >= outerUp) + continue; + if (fw > innerFw || rg > innerRg || up > innerUp) { + CParticle::AddParticle(PARTICLE_STEAM2, pos, CVector(0.0f, 0.0f, 0.0f), nil, 4.0f, FoamColour, 1, 0, 0, 0); + particles--; + } + } +} + +void +CSpecialParticleStuff::StartBoatFoamAnimation() +{ + BoatFromStart = CTimer::GetTimeInMilliseconds(); +} + +void +CSpecialParticleStuff::UpdateBoatFoamAnimation(CMatrix* pMatrix) +{ + static int32 FrameInAnimation = 0; + static float X, Y, Z, dX, dY, dZ; + CreateFoamAroundObject(pMatrix, 107.0f, 24.1f, 30.5f, 2); + uint32 prev = CTimer::GetPreviousTimeInMilliseconds(); + uint32 cur = CTimer::GetTimeInMilliseconds(); + if (FrameInAnimation != 0) { + X += dX; + Y += dY; + Z += dZ; + CVector pos = *pMatrix * CVector(X, Y, Z); + CParticle::AddParticle(PARTICLE_STEAM_NY, pos, CVector(0.0f, 0.0f, 0.0f), + nil, FrameInAnimation * 0.5f + 2.0f, FoamColour, 1, 0, 0, 0); + if (++FrameInAnimation > 15) + FrameInAnimation = 0; + } + if ((cur & 0x3FF) < (prev & 0x3FF)) { + FrameInAnimation = 1; + int rnd = CGeneral::GetRandomNumber(); + X = (int8)(rnd - 128) * 0.2f; + Y = (int8)((rnd >> 8) - 128) * 0.2f; + Z = 10.0f; + rnd = CGeneral::GetRandomNumber(); + dX = (int8)(rnd - 128) * 0.02f; + dY = (int8)((rnd >> 8) - 128) * 0.02f; + dZ = 2.0f; + } +} + STARTPATCHES InjectHook(0x518DE0, &CBulletTraces::Init, PATCH_JUMP); InjectHook(0x518E90, &CBulletTraces::AddTrace, PATCH_JUMP); diff --git a/src/render/WaterCannon.cpp b/src/render/WaterCannon.cpp index 03aa8f0e..7a9aa4d9 100644 --- a/src/render/WaterCannon.cpp +++ b/src/render/WaterCannon.cpp @@ -2,7 +2,7 @@ #include "patcher.h" #include "WaterCannon.h" -CWaterCannon* aCannons = (CWaterCannon*)0x8F2CA8; +CWaterCannon (&aCannons)[NUM_WATERCANNONS] = *(CWaterCannon(*)[NUM_WATERCANNONS])*(uintptr*)0x8F2CA8; WRAPPER void CWaterCannons::Update(void) { EAXJMP(0x522510); } WRAPPER void CWaterCannons::UpdateOne(uint32 id, CVector *pos, CVector *dir) { EAXJMP(0x522470); } diff --git a/src/render/WaterCannon.h b/src/render/WaterCannon.h index 2fbde6bf..c2b288f2 100644 --- a/src/render/WaterCannon.h +++ b/src/render/WaterCannon.h @@ -23,4 +23,5 @@ public: static void Init(void); }; -extern CWaterCannon *aCannons; +extern CWaterCannon (&aCannons)[NUM_WATERCANNONS]; + |