2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 11:07:43 +00:00

CActorContraption fixes, better CMake dependency handling

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

View File

@@ -10,19 +10,19 @@ CAuiMeter::CAuiMeter(const CGuiWidgetParms& parms, bool noRoundUp, u32 maxCapaci
void CAuiMeter::UpdateMeterWorkers() {
float scale = xd4_workers.size() / float(xc8_maxCapacity);
int etankCap;
size_t etankCap;
if (xc4_noRoundUp)
etankCap = xcc_capacity * scale;
else
etankCap = xcc_capacity * scale + 0.5f;
int etankFill;
size_t etankFill;
if (xc4_noRoundUp)
etankFill = xd0_value * scale;
else
etankFill = xd0_value * scale + 0.5f;
for (int i = 0; i < xd4_workers.size(); ++i) {
for (size_t i = 0; i < xd4_workers.size(); ++i) {
CGuiGroup* worker = xd4_workers[i];
if (!worker)
continue;