AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 00:27:42 +00:00
Code Issues Projects Releases Wiki Activity

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/GuiSys/CGuiTextSupport.cpp
View File

@@ -84,7 +84,7 @@ void CGuiTextSupport::SetTypeWriteEffectOptions(bool enable, float chFadeTime, f
if (enable) {
if (CTextRenderBuffer* buf = GetCurrentPageRenderBuffer()) {
float chStartTime = 0.f;
for (s32 i = 0; i < buf->GetPrimitiveCount(); ++i) {
for (u32 i = 0; i < buf->GetPrimitiveCount(); ++i) {
for (const std::pair<float, int>& p : x40_primStartTimes) {
if (p.second < i)
continue;
@@ -105,7 +105,7 @@ void CGuiTextSupport::Update(float dt) {
if (x50_typeEnable) {
if (CTextRenderBuffer* buf = GetCurrentPageRenderBuffer()) {
float chStartTime = 0.f;
for (s32 i = 0; i < buf->GetPrimitiveCount(); ++i) {
for (u32 i = 0; i < buf->GetPrimitiveCount(); ++i) {
for (const std::pair<float, int>& p : x40_primStartTimes) {
if (p.second < i)
continue;
@@ -126,7 +126,7 @@ void CGuiTextSupport::Update(float dt) {
}
void CGuiTextSupport::ClearRenderBuffer() {
x60_renderBuf = rstl::nullopt;
x60_renderBuf = std::nullopt;
x2ec_renderBufferPages.clear();
}