github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-13 01:57:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #3958 from HarbourMasters/develop-macready

Browse source 
macready -> develop
This commit is contained in:
Archez 2024-02-20 10:32:28 -05:00 • committed by GitHub
commit cd5d2589f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/soh/z_scene_otr.cpp
View file

@ -178,7 +178,7 @@ bool Scene_CommandObjectList(PlayState* play, SOH::ISceneCommand* cmd) {
// Loop until a mismatch in the object lists // Loop until a mismatch in the object lists
// Then clear all object ids past that in the context object list and kill actors for those objects // Then clear all object ids past that in the context object list and kill actors for those objects
for (i = play->objectCtx.unk_09, k = 0; i < play->objectCtx.num; i++, k++) { for (i = play->objectCtx.unk_09, k = 0; i < play->objectCtx.num; i++, k++) {
if (i >= cmdObj->objects.size() || play->objectCtx.status[i].id != cmdObj->objects[k]) { if (k >= cmdObj->objects.size() || play->objectCtx.status[i].id != cmdObj->objects[k]) {
for (j = i; j < play->objectCtx.num; j++) { for (j = i; j < play->objectCtx.num; j++) {
play->objectCtx.status[j].id = OBJECT_INVALID; play->objectCtx.status[j].id = OBJECT_INVALID;
} }

8
soh/src/code/z_camera_data.inc
View file

@ -16,9 +16,11 @@ typedef struct {
union { union {
u32 unk_00; u32 unk_00;
struct { struct {
u32 unk_bit0 : 1; // SoH [Port] These bitfield values are unused and led to shifting in validModes for little endian systems
u32 unk_bit1 : 1; // Removing those so that validModes can be a complete 32 bit value
u32 validModes : 30; // u32 unk_bit0 : 1;
// u32 unk_bit1 : 1;
u32 validModes;
}; };
}; };
CameraMode* cameraModes; CameraMode* cameraModes;