fix some warnings and puppy2 obj check

This commit is contained in:
AloXado320 2021-05-07 20:30:18 -05:00
parent 730d28bbf2
commit a9a70aed1a
3 changed files with 9 additions and 8 deletions

View file

@ -891,7 +891,7 @@ void puppycam_projection_behaviours(void)
f32 turnRate = 1;
//This will only be executed if Mario's the target. If it's not, it'll reset the
if (gPuppyCam.targetObj = gMarioState->marioObj)
if (gPuppyCam.targetObj == gMarioState->marioObj)
{
if (gPuppyCam.options.turnAggression > 0 && gPuppyCam.flags & PUPPYCAM_BEHAVIOUR_TURN_HELPER && !(gPuppyCam.flags & PUPPYCAM_BEHAVIOUR_INPUT_8DIR) &&
gMarioState->vel[1] == 0.0f && !(gPuppyCam.flags & PUPPYCAM_BEHAVIOUR_INPUT_4DIR) && gPuppyCam.options.inputType != 2)
@ -902,7 +902,7 @@ void puppycam_projection_behaviours(void)
if (gMarioState->action & ACT_FLAG_BUTT_OR_STOMACH_SLIDE)
turnRate = 4; //If he's sliding, do it 4x as fast.
//The deal here, is if Mario's moving, or he's sliding and the camera's within 90 degrees behind him, it'll auto focus behind him, with an intensity based on the camera's centre speed.
//It also scales with forward velocity, so it's a gradual effect as he speeds up.
//It also scales with forward velocity, so it's a gradual effect as he speeds up.
if ((ABS(gPlayer1Controller->rawStickX) > 20 && !(gMarioState->action & ACT_FLAG_BUTT_OR_STOMACH_SLIDE)) ||
(gMarioState->action & ACT_FLAG_BUTT_OR_STOMACH_SLIDE &&
(s16)ABS(((gPuppyCam.yaw + 0x8000) % 0xFFFF - 0x8000) - ((gMarioState->faceAngle[1]) % 0xFFFF - 0x8000)) < 0x3000 ))
@ -1017,7 +1017,7 @@ void puppycam_projection_behaviours(void)
}
//Support for most vanilla camera actions
static void puppycam_vanilla_actions(void)
static void puppycam_vanilla_actions(void)
{
//Adds support for wing mario tower
if (gMarioState->floor && gMarioState->floor->type == SURFACE_LOOK_UP_WARP
@ -1027,13 +1027,13 @@ static void puppycam_vanilla_actions(void)
level_trigger_warp(gMarioState, WARP_OP_UNKNOWN_01);
}
}
if (gSecondCameraFocus != NULL) {
//Adds support for Bowser second camera focus
if (gCurrLevelNum == LEVEL_BOWSER_1 || gCurrLevelNum == LEVEL_BOWSER_2 || gCurrLevelNum == LEVEL_BOWSER_3) {
gPuppyCam.targetObj2 = gSecondCameraFocus;
}
//Adds support for BOB - WF bosses second camera focus
if (gMarioState->floor && gMarioState->floor->type == SURFACE_BOSS_FIGHT_CAMERA) {
gPuppyCam.targetObj2 = gSecondCameraFocus;

View file

@ -1,3 +1,4 @@
#include "macros.h"
#include "audio_api.h"
static bool audio_null_init(void) {
@ -12,7 +13,7 @@ static int audio_null_get_desired_buffered(void) {
return 0;
}
static void audio_null_play(const uint8_t *buf, size_t len) {
static void audio_null_play(UNUSED const uint8_t *buf, UNUSED size_t len) {
}
static void audio_null_shutdown(void) {

View file

@ -68,10 +68,10 @@ extern void thread5_game_loop(void *arg);
extern void create_next_audio_buffer(s16 *samples, u32 num_samples);
void game_loop_one_iteration(void);
void dispatch_audio_sptask(struct SPTask *spTask) {
void dispatch_audio_sptask(UNUSED struct SPTask *spTask) {
}
void set_vblank_handler(s32 index, struct VblankHandler *handler, OSMesgQueue *queue, OSMesg *msg) {
void set_vblank_handler(UNUSED s32 index, UNUSED struct VblankHandler *handler, UNUSED OSMesgQueue *queue, UNUSED OSMesg *msg) {
}
static bool inited = false;