vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

No more brackets for memmove/memcpy

This commit is contained in:
Colton Rushton 2021-02-25 20:22:46 -04:00
parent 51530dea78
commit 9a146f118f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/PR/os_libc.h
View File

@ -16,8 +16,8 @@
#include <string.h>
#undef bzero
#undef bcopy
#define bzero(buf, len) memset((buf), 0, (len))
#define bcopy(src, dst, len) memmove((dst), (src), (len))
#define bzero(buf, len) memset(buf, 0, len)
#define bcopy(src, dst, len) memmove(dst, src, len)
#else

6
src/game/behaviors/camera_lakitu.inc.c
View File

@ -35,8 +35,10 @@ static void camera_lakitu_intro_act_trigger_cutscene(void) {
if (gMarioObject->oPosX > -555.0f && gMarioObject->oPosX < 555.0f && gMarioObject->oPosY > 800.0f
#endif
&& gMarioObject->oPosZ > -2000.0f && gMarioObject->oPosZ < -177.0f
&& gMarioObject->oPosZ < -177.0f) // always double check your conditions
{
#ifndef QOL_FIXES
&& gMarioObject->oPosZ < -177.0f // always double check your conditions
#endif
) {
if (set_mario_npc_dialog(2) == 1) {
o->oAction = CAMERA_LAKITU_INTRO_ACT_SPAWN_CLOUD;
}