From d71ff64d2d8dfd455aa89dfffa9c9828b96c4a91 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Thu, 4 Jul 2024 00:38:31 -0400 Subject: minor d_cam_param work --- src/d/d_cam_param.cpp | 22 ++++++++++++++++++---- src/d/d_meter.cpp | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) (limited to 'src/d') diff --git a/src/d/d_cam_param.cpp b/src/d/d_cam_param.cpp index ce74b5a6..50ba53ad 100644 --- a/src/d/d_cam_param.cpp +++ b/src/d/d_cam_param.cpp @@ -66,13 +66,27 @@ dCamParam_c::~dCamParam_c() { } /* 800AF978-800AF9BC .text Change__11dCamParam_cFl */ -void dCamParam_c::Change(s32) { - /* Nonmatching */ +BOOL dCamParam_c::Change(s32 i_styleIdx) { + mStyleIdx = i_styleIdx; + if (i_styleIdx < style_num) { + mpStyle = &styles[mStyleIdx]; + return TRUE; + } else { + mpStyle = &styles[0]; + return FALSE; + } } /* 800AF9BC-800AFA04 .text SearchStyle__11dCamParam_cFUl */ -void dCamParam_c::SearchStyle(u32) { - /* Nonmatching */ +s32 dCamParam_c::SearchStyle(u32 r4) { + s32 styleIndex = -1; + for (s32 i = 0; i < style_num; i++) { + if (styles[i].m00 == r4) { + styleIndex = i; + break; + } + } + return styleIndex; } /* 800AFA04-800AFAA4 .text ratiof__11dCamParam_cFffff */ diff --git a/src/d/d_meter.cpp b/src/d/d_meter.cpp index 75c5abb2..24d883de 100644 --- a/src/d/d_meter.cpp +++ b/src/d/d_meter.cpp @@ -1774,7 +1774,7 @@ static BOOL dMeter_Execute(sub_meter_class* i_this) { dMeter_childPaneTrans(i_this->field_0x2438 + 0x09 + i, i_this->field_0x2438 + 0x16, f31); } - dMeter_childPaneTransOnly(i_this->field_0x1638 + 0x1E, i_this->field_0x2438 + 0x16, f31, f29); + dMeter_childPaneTransOnly(i_this->field_0x1638 + 0x1E, i_this->field_0x2438 + 0x16, f31, f30); dMeter_childPaneTrans(i_this->field_0x2438 + 0x0C, i_this->field_0x2438 + 0x16, f31); dMeter_childPaneTrans(i_this->field_0x2438 + 0x0B, i_this->field_0x2438 + 0x16, f31); -- cgit v1.2.3