mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-06 10:45:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix camera structs being swapped

Browse Source 
`camera_process_class` and `camera_class` were swapped according to TP's RTTI info.
This commit is contained in:
LagoLunatic
2026-08-17 23:03:22 -04:00
parent e3f5172595
commit f0d5cd7b6a
58 changed files with 182 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_ship.cpp
+9 -9
View File
@@ -2548,7 +2548,7 @@ BOOL daShip_c::procTurn_init() {
seStart(JA_SE_SHIP_LOOK_FORWARD, &eyePos);
mProc = &daShip_c::procTurn;
m038E = 0;
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera->mCamera.Stop();
cXyz cameraPos = camera->mCamera.Eye() - camera->mCamera.Center();
cameraPos.normalize();
@@ -2568,7 +2568,7 @@ BOOL daShip_c::procTurn() {
cXyz local_b8;
cXyz local_ac;
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
local_c4 = current.pos - camera->mCamera.Center();
fVar5 = local_c4.abs();
local_ac = camera->mCamera.Center() + (current.pos - m045C);
@@ -2621,7 +2621,7 @@ BOOL daShip_c::procTurn() {
/* 00006C78-00006DE0 .text procTornadoUp_init__8daShip_cFv */
BOOL daShip_c::procTornadoUp_init() {
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
onStateFlg((daSHIP_SFLG)(daSFLG_FLY_e | daSFLG_UNK1000_e));
mCurMode = 12;
mProc = &daShip_c::procTornadoUp;
@@ -2658,7 +2658,7 @@ BOOL daShip_c::procTornadoUp() {
shape_angle.y += 0x1C25;
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
cXyz local_3c(tornado->current.pos.x, current.pos.y, tornado->current.pos.z);
camera->mCamera.Set(local_3c, camera->mCamera.Eye());
@@ -2684,7 +2684,7 @@ BOOL daShip_c::procStartModeWarp_init() {
setPartOffAnime();
}
m03A6 = 0x1C25;
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera->mCamera.Stop();
cXyz local_38(current.pos.x, m03F4 + 1500.0f, current.pos.z + 2000.0f);
camera->mCamera.Set(current.pos, local_38);
@@ -2704,7 +2704,7 @@ BOOL daShip_c::procStartModeWarp() {
cXyz local_30;
daTornado_c* tornado = (daTornado_c*)fopAcM_SearchByID(mTactWarpID);
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
shape_angle.y += m03A6;
current.angle.y = shape_angle.y;
if (tornado) {
@@ -2864,7 +2864,7 @@ BOOL daShip_c::procWhirlDown_init() {
speed.y = 0.0f;
onStateFlg(daSFLG_FLY_e);
onStateFlg(daSFLG_UNK1000_e);
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera->mCamera.Stop();
cXyz local_38(mWhirlActor->current.pos.x, mWhirlActor->current.pos.y + 2500.0f, mWhirlActor->current.pos.z + 4000.0f);
camera->mCamera.Set(mWhirlActor->current.pos, local_38);
@@ -2909,7 +2909,7 @@ BOOL daShip_c::procStartModeThrow_init() {
setPartOffAnime();
}
m03A6 = l_HIO.throw_return_angle_speed;
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera->mCamera.Stop();
cXyz local_38(current.pos.x + cM_scos(current.angle.y) * 300.0f,
m03F4 + 150.0f,
@@ -2926,7 +2926,7 @@ BOOL daShip_c::procStartModeThrow() {
GXColor amb;
GXColor diff;
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
shape_angle.y += m03A6;
camera->mCamera.Set(current.pos, camera->mCamera.Eye());
if (m037A == 0) {