mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix BUGFIXES build

Browse Source
This commit is contained in:
Prakxo
2024-08-12 22:23:08 +02:00
parent 0598a764e6
commit ccd9175bf8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/m_island.c
+2 -2
View File
@@ -364,8 +364,8 @@ static void mISL_agb_to_gc_fllot_bit(mHm_fllot_bit_c* gc, u32* agb) {
gc->wall_original = (u32)gc->wall_original;
gc->floor_original = (u32)gc->floor_original;
#else
gc->wall_original = agb->wall_original;
gc->floor_original = agb->floor_original;
gc->wall_original = ((mHm_fllot_bit_c*)(agb))->wall_original;
gc->floor_original = ((mHm_fllot_bit_c*)(agb))->floor_original;
#endif
}
src/m_npc.c
+2 -1
View File
@@ -362,6 +362,8 @@ extern void mNpc_CopyAnimalMemory(Anmmem_c* dst, Anmmem_c* src) {
*/
extern void mNpc_AddFriendship(Anmmem_c* memory, int amount) {
int friendship = memory->friendship + amount;
/* @BUG - devs checked for memory being NULL *after* deferencing it */
#ifdef BUGFIXES
if (memory == NULL) {
@@ -369,7 +371,6 @@ extern void mNpc_AddFriendship(Anmmem_c* memory, int amount) {
}
#endif
int friendship = memory->friendship + amount;
#ifndef BUGFIXES
if (memory == NULL) {