d_s_room / d_s_name / d_a_title debug work (#3123)

* d_s_room / d_s_name debug work

* camera_class rtti fix

* d_a_title debug / handle shield rel changes

* fix shield build

* fix regressions
This commit is contained in:
TakaRikka
2026-03-06 22:30:25 -08:00
committed by GitHub
parent a2b179f952
commit 8e2545f2ec
140 changed files with 1293 additions and 1042 deletions
+6 -6
View File
@@ -286,7 +286,7 @@ static int daB_OB_Draw(b_ob_class* i_this) {
for (int i = 0; i < 19; i++) {
if (!i_this->mBodyParts[i].mHide) {
if ((i_this->mBodyParts[i].mPos - camera->lookat.eye).abs() >
if ((i_this->mBodyParts[i].mPos - camera->view.lookat.eye).abs() >
i_this->mBodyParts[i].mSize * (JREG_F(17) + 500.0f))
{
g_env_light.setLightTevColorType_MAJI(i_this->mBodyParts[i].mpMorf->getModel(),
@@ -1946,7 +1946,7 @@ static void fish_move(b_ob_class* i_this) {
a_this->attention_info.position.y += 50.0f;
if (i_this->mDemoAction == 21 || i_this->mDemoAction == 22) {
sp84 = dComIfGp_getCamera(0)->lookat.eye - sp90;
sp84 = dComIfGp_getCamera(0)->view.lookat.eye - sp90;
} else {
sp84 = player->eyePos - sp90;
}
@@ -1996,8 +1996,8 @@ static void* s_hasidel_sub(void* i_this, void* i_data) {
static void demo_camera(b_ob_class* i_this) {
fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera_class* camera0 = dComIfGp_getCamera(0);
camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera_process_class* camera0 = dComIfGp_getCamera(0);
cXyz sp58;
cXyz sp64;
@@ -2027,8 +2027,8 @@ static void demo_camera(b_ob_class* i_this) {
daPy_getPlayerActorClass()->changeOriginalDemo();
daPy_getPlayerActorClass()->changeDemoMode(46, 0, 0, 0);
i_this->mDemoCamEye = camera0->lookat.eye;
i_this->mDemoCamCenter = camera0->lookat.center;
i_this->mDemoCamEye = camera0->view.lookat.eye;
i_this->mDemoCamCenter = camera0->view.lookat.center;
sp58 = i_this->mDemoCamEye - tentacle->current.pos;
i_this->field_0x5ce0 = cM_atan2s(sp58.x, sp58.z);