AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CIntElement: Join variable declarations with assignments where applicable

This commit is contained in:
Lioncash 2019-10-04 19:17:27 -04:00
parent 1044b0f1ee
commit 83873b580e
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Runtime/Particle/CIntElement.cpp
View File

@ -81,14 +81,17 @@ bool CIEClamp::GetValue(int frame, int& valOut) const {
} }
int CIEClamp::GetMaxValue() const { int CIEClamp::GetMaxValue() const {
int a, b, valOut; const int a = x4_min->GetMaxValue();
a = x4_min->GetMaxValue(); const int b = x8_max->GetMaxValue();
b = x8_max->GetMaxValue(); int valOut = xc_val->GetMaxValue();
valOut = xc_val->GetMaxValue();
if (valOut > b) if (valOut > b) {
valOut = b; valOut = b;
if (valOut < a) }
if (valOut < a) {
valOut = a; valOut = a;
}
return valOut; return valOut;
} }
@ -112,9 +115,8 @@ bool CIEAdd::GetValue(int frame, int& valOut) const {
} }
int CIEAdd::GetMaxValue() const { int CIEAdd::GetMaxValue() const {
int a, b; const int a = x4_a->GetMaxValue();
a = x4_a->GetMaxValue(); const int b = x8_b->GetMaxValue();
b = x8_b->GetMaxValue();
return a + b; return a + b;
} }
@ -144,10 +146,10 @@ bool CIELifetimePercent::GetValue(int frame, int& valOut) const {
} }
int CIELifetimePercent::GetMaxValue() const { int CIELifetimePercent::GetMaxValue() const {
int a; const int a = std::max(0, x4_percentVal->GetMaxValue());
a = x4_percentVal->GetMaxValue();
a = std::max(0, a); // Assume 10000 frames max (not ideal estimate)
return (a / 100.0f) * 10000 + 0.5f; /* Assume 10000 frames max (not ideal estimate) */ return int((float(a) / 100.0f) * 10000 + 0.5f);
} }
bool CIEInitialRandom::GetValue(int frame, int& valOut) const { bool CIEInitialRandom::GetValue(int frame, int& valOut) const {
@ -268,13 +270,14 @@ bool CIEModulo::GetValue(int frame, int& valOut) const {
} }
int CIEModulo::GetMaxValue() const { int CIEModulo::GetMaxValue() const {
int a, b; const int a = x4_a->GetMaxValue();
a = x4_a->GetMaxValue(); const int b = x8_b->GetMaxValue();
b = x8_b->GetMaxValue();
if (b != 0) if (b != 0) {
return b - 1; return b - 1;
else }
return a;
return a;
} }
bool CIESubtract::GetValue(int frame, int& valOut) const { bool CIESubtract::GetValue(int frame, int& valOut) const {
@ -286,9 +289,8 @@ bool CIESubtract::GetValue(int frame, int& valOut) const {
} }
int CIESubtract::GetMaxValue() const { int CIESubtract::GetMaxValue() const {
int a, b; const int a = x4_a->GetMaxValue();
a = x4_a->GetMaxValue(); const int b = x8_b->GetMaxValue();
b = x8_b->GetMaxValue();
return a - b; return a - b;
} }