mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-03 01:53:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix ultratypes types (#1454)

Browse Source 
* Fix ultratypes types

* Add back size_t and NULL

* Callocs

* Callocs pt 2

* bool

* STDC version checks
This commit is contained in:
Derek Hensley
2023-11-15 22:01:42 -07:00
committed by GitHub
parent d9585d7444
commit 5acaec4486
54 changed files with 178 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+6 -6
View File
@@ -1363,15 +1363,15 @@ f32 Player_GetRunSpeedLimit(Player* player) {
}
}
s32 func_800B7118(Player* player) {
bool func_800B7118(Player* player) {
return player->stateFlags1 & PLAYER_STATE1_8;
}
s32 func_800B7128(Player* player) {
bool func_800B7128(Player* player) {
return func_800B7118(player) && (player->unk_ACC != 0);
}
s32 func_800B715C(PlayState* play) {
bool func_800B715C(PlayState* play) {
Player* player = GET_PLAYER(play);
return player->stateFlags2 & PLAYER_STATE2_8;
@@ -1393,7 +1393,7 @@ void Actor_MountHorse(PlayState* play, Player* player, Actor* horse) {
horse->child = &player->actor;
}
s32 func_800B7200(Player* player) {
bool func_800B7200(Player* player) {
return (player->stateFlags1 & (PLAYER_STATE1_80 | PLAYER_STATE1_20000000)) ||
(player->csAction != PLAYER_CSACTION_NONE);
}
@@ -2100,7 +2100,7 @@ void Actor_GetScreenPos(PlayState* play, Actor* actor, s16* x, s16* y) {
*y = PROJECTED_TO_SCREEN_Y(projectedPos, invW);
}
s32 Actor_OnScreen(PlayState* play, Actor* actor) {
bool Actor_OnScreen(PlayState* play, Actor* actor) {
Vec3f projectedPos;
f32 invW;
s32 pad[2];
@@ -3492,7 +3492,7 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, PlayState* play) {
return newHead;
}
s32 Target_InTargetableScreenRegion(PlayState* play, Actor* actor) {
bool Target_InTargetableScreenRegion(PlayState* play, Actor* actor) {
s16 x;
s16 y;