mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-05 23:44:53 +00:00
Code Issues Projects Releases Wiki Activity

Fix misc 6 (#1148)

Browse source 
* Fix typo `vertexs` -> `vertices`

* Fix typo `limbMatricies` -> `limbMatrices`

* Fix some `gSPTextureRectangle` usage of fixed point constants

* Run formatter

* `ALIGN8` macro

* `object_skj` cleanup

* sholder -> shoulder

* cleanup `stdbool.h`

* Some function prototypes cleanup

* Use macros in `osVirtualToPhysical`
This commit is contained in:
Dragorn421 2022-02-20 14:22:29 +01:00 • committed by GitHub
parent c3533052ca
commit a9526a3354
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 128 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/code/z_onepointdemo.c
View file

@ -1349,23 +1349,23 @@ s32 OnePointCutscene_AttentionSetSfx(GlobalContext* globalCtx, Actor* actor, s32
}
// unused
void OnePointCutscene_EnableAttention() {
void OnePointCutscene_EnableAttention(void) {
sDisableAttention = false;
}
// unused
void OnePointCutscene_DisableAttention() {
void OnePointCutscene_DisableAttention(void) {
sDisableAttention = true;
}
s32 OnePointCutscene_CheckForCategory(GlobalContext* globalCtx, s32 category) {
s32 OnePointCutscene_CheckForCategory(GlobalContext* globalCtx, s32 actorCategory) {
Camera* parentCam = globalCtx->cameraPtrs[MAIN_CAM];
while (parentCam->childCamIdx != SUBCAM_FREE) {
parentCam = globalCtx->cameraPtrs[parentCam->childCamIdx];
if ((parentCam == NULL) || (parentCam->setting != CAM_SET_CS_ATTENTION)) {
break;
} else if (category == parentCam->target->category) {
} else if (actorCategory == parentCam->target->category) {
return true;
}
}