mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-09 18:57:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Switch Flag "None" macro (#1412)

Browse Source 
* switch flag none

* cleanup brackets

* individual actor switch flag none

* missed some, small cleanup

* <= 0x80
This commit is contained in:
engineer124
2023-10-15 19:59:25 +11:00
committed by GitHub
parent a1bdc6c382
commit f545f164b4
52 changed files with 160 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+3 -3
View File
@@ -728,7 +728,7 @@ void Target_Update(TargetContext* targetCtx, Player* player, Actor* lockOnActor,
* Tests if a current scene switch flag is set.
*/
s32 Flags_GetSwitch(PlayState* play, s32 flag) {
if ((flag >= 0) && (flag < 0x80)) {
if ((flag > SWITCH_FLAG_NONE) && (flag < 0x80)) {
return play->actorCtx.sceneFlags.switches[(flag & ~0x1F) >> 5] & (1 << (flag & 0x1F));
}
return 0;
@@ -738,7 +738,7 @@ s32 Flags_GetSwitch(PlayState* play, s32 flag) {
* Sets a current scene switch flag.
*/
void Flags_SetSwitch(PlayState* play, s32 flag) {
if ((flag >= 0) && (flag < 0x80)) {
if ((flag > SWITCH_FLAG_NONE) && (flag < 0x80)) {
play->actorCtx.sceneFlags.switches[(flag & ~0x1F) >> 5] |= 1 << (flag & 0x1F);
}
}
@@ -747,7 +747,7 @@ void Flags_SetSwitch(PlayState* play, s32 flag) {
* Unsets a current scene switch flag.
*/
void Flags_UnsetSwitch(PlayState* play, s32 flag) {
if ((flag >= 0) && (flag < 0x80)) {
if ((flag > SWITCH_FLAG_NONE) && (flag < 0x80)) {
play->actorCtx.sceneFlags.switches[(flag & ~0x1F) >> 5] &= ~(1 << (flag & 0x1F));
}
}