Skip to content

Commit

Permalink
Renames
Browse files Browse the repository at this point in the history
  • Loading branch information
@KieronJ
KieronJ committed Jun 8, 2024
1 parent 26028cd commit 869f82e
Show file tree
Hide file tree
Showing 155 changed files with 2,955 additions and 2,945 deletions.
4 changes: 2 additions & 2 deletions build/functions.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,11 @@
8001DF48 1144 DG_Trans_Chanl_helper_8001DF48
8001E3C0 448 DG_Trans_Chanl_8001E3C0
8001E580 8 DG_TransEnd_8001E580
8001E588 428 DG_MatrixRotXYZ_8001E588
8001E588 428 DG_MatrixRot_8001E588
8001E734 504 DG_MatrixRotYXZ_8001E734
8001E92C 428 DG_MatrixRotZYX_8001E92C
8001EAD8 96 DG_TransposeMatrix_8001EAD8
8001EB38 380 sub_8001EB38
8001EB38 380 DG_ShadowMatrix_8001EB38
8001ECB4 280 DG_ReflectVector_8001ECB4
8001EDCC 584 DG_ReflectMatrix_8001EDCC
8001F014 100 DG_DrawSyncResetGraph_8001F014
Expand Down
72 changes: 36 additions & 36 deletions src/Bullet/amissile.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ extern SVECTOR DG_ZeroVector_800AB39C;

void amissile_act_helper_8006D2A0(AMissileWork *work, SVECTOR input)
{
SVECTOR position = work->field_20_ctrl.field_0_mov;
SVECTOR position = work->control.mov;
SVECTOR result;
SVECTOR rotation;

Expand Down Expand Up @@ -82,13 +82,13 @@ void amissile_act_helper_8006D37C(AMissileWork *work)

if (work->field_120 < 5)
{
DG_RotVector_8001BE98(&svector_8009F4A8, &work->field_20_ctrl.field_44_step, 1);
DG_RotVector_8001BE98(&svector_8009F4A8, &work->control.step, 1);
return;
}

if (work->field_120 < 14)
{
DG_RotVector_8001BE98(&svector_8009F4B0, &work->field_20_ctrl.field_44_step, 1);
DG_RotVector_8001BE98(&svector_8009F4B0, &work->control.step, 1);
return;
}

Expand All @@ -101,20 +101,20 @@ void amissile_act_helper_8006D37C(AMissileWork *work)
svector_8009F4A0.vz = 0;
}

DG_RotVector_8001BE98(&svector_8009F4A0, &work->field_20_ctrl.field_44_step, 1);
DG_RotVector_8001BE98(&svector_8009F4A0, &work->control.step, 1);

if (!target_800BDF00)
{
return;
}

pTargetPos = &target_800BDF00->center;
diff.vx = pTargetPos->vx / 8 - work->field_20_ctrl.field_0_mov.vx / 8;
diff.vy = pTargetPos->vy / 8 - work->field_20_ctrl.field_0_mov.vy / 8;
diff.vz = pTargetPos->vz / 8 - work->field_20_ctrl.field_0_mov.vz / 8;
diff.vx = pTargetPos->vx / 8 - work->control.mov.vx / 8;
diff.vy = pTargetPos->vy / 8 - work->control.mov.vy / 8;
diff.vz = pTargetPos->vz / 8 - work->control.mov.vz / 8;

dir = GV_VecDir2_80016EF8(&diff);
temp_v0 = GV_DiffDirS_8001704C(work->field_20_ctrl.field_4C_turn.vy, dir);
temp_v0 = GV_DiffDirS_8001704C(work->control.turn.vy, dir);

if (abs(temp_v0) > 1024)
{
Expand All @@ -125,34 +125,34 @@ void amissile_act_helper_8006D37C(AMissileWork *work)

if (abs(temp_v0) < temp_s1)
{
work->field_20_ctrl.field_4C_turn.vy += temp_v0;
work->control.turn.vy += temp_v0;
}
else if (temp_v0 > 0)
{
work->field_20_ctrl.field_4C_turn.vy += temp_s1;
work->control.turn.vy += temp_s1;
}
else
{
work->field_20_ctrl.field_4C_turn.vy -= temp_s1;
work->control.turn.vy -= temp_s1;
}

result.vx = diff.vy;
result.vz = SquareRoot0(diff.vx * diff.vx + diff.vz * diff.vz);

dir = -GV_VecDir2_80016EF8(&result);
temp_v0 = GV_DiffDirS_8001704C(work->field_20_ctrl.field_4C_turn.vx, (dir - 1024) & 4095);
temp_v0 = GV_DiffDirS_8001704C(work->control.turn.vx, (dir - 1024) & 4095);

if (abs(temp_v0) < temp_s1)
{
work->field_20_ctrl.field_4C_turn.vx += temp_v0;
work->control.turn.vx += temp_v0;
}
else if (temp_v0 > 0)
{
work->field_20_ctrl.field_4C_turn.vx += temp_s1;
work->control.turn.vx += temp_s1;
}
else
{
work->field_20_ctrl.field_4C_turn.vx -= temp_s1;
work->control.turn.vx -= temp_s1;
}
}

Expand Down Expand Up @@ -199,26 +199,26 @@ void amissile_act_8006D608(AMissileWork *work)
int result;
Blast_Data *pBlastData;

pCtrl = &work->field_20_ctrl;
position = pCtrl->field_0_mov;
pCtrl = &work->control;
position = pCtrl->mov;

GM_ActControl_80025A7C(pCtrl);
amissile_act_helper_8006D37C(work);
GM_ActObject2_80034B88((OBJECT *)&work->field_9C_kmd);

work->field_134_prim->world.t[0] = work->field_20_ctrl.field_0_mov.vx;
work->field_134_prim->world.t[1] = work->field_20_ctrl.field_0_mov.vy;
work->field_134_prim->world.t[2] = work->field_20_ctrl.field_0_mov.vz;
work->field_134_prim->world.t[0] = work->control.mov.vx;
work->field_134_prim->world.t[1] = work->control.mov.vy;
work->field_134_prim->world.t[2] = work->control.mov.vz;

DG_GetLightMatrix2_8001A5D8(&pCtrl->field_0_mov, work->field_C0_light_matrix);
DG_GetLightMatrix2_8001A5D8(&pCtrl->mov, work->field_C0_light_matrix);

if (work->field_120 >= 15)
{
amissile_act_helper_8006D2A0(work, position);
}

amissile_alive_8009F490 = 1;
svector_8009F494 = pCtrl->field_0_mov;
svector_8009F494 = pCtrl->mov;

if (work->field_120 == 0)
{
Expand Down Expand Up @@ -251,24 +251,24 @@ void amissile_act_8006D608(AMissileWork *work)
}

// probably an inline
pCtrl = &work->field_20_ctrl;
GV_AddVec3_80016D00(&pCtrl->field_0_mov, &pCtrl->field_44_step, &addition);
pCtrl = &work->control;
GV_AddVec3_80016D00(&pCtrl->mov, &pCtrl->step, &addition);

result = amissile_act_helper_8006D600();

// this is probably also an inline
if (work->field_20_ctrl.field_58 <= 0 && !work->field_20_ctrl.field_57)
if (work->control.field_58 <= 0 && !work->control.field_57)
{
if (++work->field_120 != 90 &&
!GM_Target_8002E1B8(&pCtrl->field_0_mov, &addition,
work->field_20_ctrl.field_2C_map->field_0_map_index_bit, &addition, 1) &&
!GM_Target_8002E1B8(&pCtrl->mov, &addition,
work->control.map->index, &addition, 1) &&
!dword_8009F49C)
{
if (!result)
{
if (abs(work->field_20_ctrl.field_0_mov.vx) <= 30000 &&
abs(work->field_20_ctrl.field_0_mov.vy) <= 30000 &&
abs(work->field_20_ctrl.field_0_mov.vz) <= 30000)
if (abs(work->control.mov.vx) <= 30000 &&
abs(work->control.mov.vy) <= 30000 &&
abs(work->control.mov.vz) <= 30000)
{
return;
}
Expand All @@ -277,7 +277,7 @@ void amissile_act_8006D608(AMissileWork *work)
}

#ifdef VR_EXE
rotator = work->field_20_ctrl.field_0_mov;
rotator = work->control.mov;

if (rotator.vx > 30000)
{
Expand Down Expand Up @@ -306,7 +306,7 @@ void amissile_act_8006D608(AMissileWork *work)
rotator.vz = -30000;
}

DG_SetPos2_8001BC8C(&rotator, &work->field_20_ctrl.field_8_rot);
DG_SetPos2_8001BC8C(&rotator, &work->control.rot);
#endif

if (!result)
Expand Down Expand Up @@ -339,7 +339,7 @@ void amissile_kill_8006D99C(AMissileWork *work)
{
DG_PRIM *pPrim;

GM_FreeControl_800260CC(&work->field_20_ctrl);
GM_FreeControl_800260CC(&work->control);
GM_FreeObject_80034BF8((OBJECT *)&work->field_9C_kmd);

pPrim = work->field_134_prim;
Expand All @@ -362,7 +362,7 @@ extern MATRIX DG_ZeroMatrix_8009D430;

int amissile_loader_8006DA0C(AMissileWork *work, MATRIX *pMtx, int side)
{
CONTROL *pCtrl = &work->field_20_ctrl;
CONTROL *pCtrl = &work->control;
OBJECT_NO_ROTS *pKmd;
DG_OBJS *pObjs;
RECT *pRect;
Expand All @@ -381,7 +381,7 @@ int amissile_loader_8006DA0C(AMissileWork *work, MATRIX *pMtx, int side)

pKmd = &work->field_9C_kmd;

pCtrl->field_55_skip_flag |= CTRL_SKIP_NEAR_CHECK;
pCtrl->skip_flag |= CTRL_SKIP_NEAR_CHECK;
pCtrl->field_59 = 8;

GM_InitObjectNoRots_800349B0(pKmd, 0x76AB, 0x36D, 0);
Expand Down Expand Up @@ -409,7 +409,7 @@ int amissile_loader_8006DA0C(AMissileWork *work, MATRIX *pMtx, int side)
return -1;
}

DG_SetPos2_8001BC8C(&pCtrl->field_0_mov, &pCtrl->field_8_rot);
DG_SetPos2_8001BC8C(&pCtrl->mov, &pCtrl->rot);

vector.vz = 0;
vector.vx = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/Bullet/amissile.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
typedef struct AMissileWork
{
GV_ACT field_0_actor;
CONTROL field_20_ctrl;
CONTROL control;
OBJECT_NO_ROTS field_9C_kmd;
MATRIX field_C0_light_matrix[2];
MATRIX field_100_rotation_matrix;
Expand Down
16 changes: 8 additions & 8 deletions src/Bullet/bakudan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void bakudan_act_8006A218(BakudanWork *work)
return;
}

pCtrl = &work->field_20_ctrl;
pCtrl = &work->control;
pPad = &GV_PadData_800B05C0[0];

if (GM_PlayerStatus_800ABA50 & PLAYER_USING_CONTROLLER_PORT_2)
Expand Down Expand Up @@ -76,7 +76,7 @@ void bakudan_act_8006A218(BakudanWork *work)
GM_CurrentMap_800AB9B0 = work->field_118;

GM_ActObject2_80034B88((OBJECT *)&work->field_9C_kmd);
DG_GetLightMatrix_8001A3C4(&pCtrl->field_0_mov, work->field_C0_light_mtx);
DG_GetLightMatrix_8001A3C4(&pCtrl->mov, work->field_C0_light_mtx);

#ifdef VR_EXE
// VR executable for some reason assigns the result
Expand Down Expand Up @@ -116,21 +116,21 @@ void bakudan_act_8006A218(BakudanWork *work)
{
ReadRotMatrix(&rotation);
NewBlast_8006DFDC(&rotation, &blast_data_8009F4B8[1]);
sub_8002A258(work->field_20_ctrl.field_2C_map->field_8_hzd, &work->field_20_ctrl.field_10_events);
sub_8002A258(work->control.map->hzd, &work->control.field_10_events);
GV_DestroyActor_800151C8(&work->field_0_actor);
}
else if (pMtx)
{
DG_SetPos_8001BC44(pMtx);
DG_PutVector_8001BE48(work->field_104, &pCtrl->field_0_mov, 1);
DG_MatrixRotYXZ_8001E734(pMtx, &pCtrl->field_8_rot);
DG_PutVector_8001BE48(work->field_104, &pCtrl->mov, 1);
DG_MatrixRotYXZ_8001E734(pMtx, &pCtrl->rot);
}
}

void bakudan_kill_8006A4A4(BakudanWork *work)
{
GM_FreeControl_800260CC(&work->field_20_ctrl);
GM_ClearBulName_8004FBE4(work->field_20_ctrl.field_30_scriptData);
GM_FreeControl_800260CC(&work->control);
GM_ClearBulName_8004FBE4(work->control.name);
GM_FreeObject_80034BF8((OBJECT *)&work->field_9C_kmd);

if (work->field_114 >= 0)
Expand All @@ -155,7 +155,7 @@ int bakudan_next_free_item_8006A510()

int bakudan_8006A54C(BakudanWork *work, MATRIX *pMtx, SVECTOR *pVec, int a4, void *data)
{
CONTROL *pCtrl = &work->field_20_ctrl;
CONTROL *pCtrl = &work->control;
OBJECT_NO_ROTS *pKmd;
int nextItem;
HITTABLE *pItem;
Expand Down
2 changes: 1 addition & 1 deletion src/Bullet/bakudan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
typedef struct BakudanWork
{
GV_ACT field_0_actor;
CONTROL field_20_ctrl;
CONTROL control;
OBJECT_NO_ROTS field_9C_kmd;
MATRIX field_C0_light_mtx[2];
MATRIX *field_100_pMtx;
Expand Down
Loading

0 comments on commit 869f82e

Please sign in to comment.