mirror of
https://github.com/zeldaret/mm.git
synced 2026-06-02 10:09:58 -04:00
Organize libc and libm files (#1499)
* memmove * strcpy * strcmp * memset * fmodf * fix some missing includes * Remove libc header dependencies on libultra * fix * review
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
#include "global.h"
|
||||
#include "libc/string.h"
|
||||
|
||||
static CutsceneCamera* sCurCsCamera;
|
||||
|
||||
@@ -44,8 +45,8 @@ s32 CutsceneCamera_Init(Camera* camera, CutsceneCamera* csCamera) {
|
||||
|
||||
sCurCsCamera = csCamera;
|
||||
|
||||
__osMemset(&csCamera->eyeInterp, 0, sizeof(CutsceneCameraInterp));
|
||||
__osMemset(&csCamera->atInterp, 0, sizeof(CutsceneCameraInterp));
|
||||
memset(&csCamera->eyeInterp, 0, sizeof(CutsceneCameraInterp));
|
||||
memset(&csCamera->atInterp, 0, sizeof(CutsceneCameraInterp));
|
||||
|
||||
csCamera->eyeInterp.type = csCamera->atInterp.type = CS_CAM_INTERP_OFF;
|
||||
|
||||
|
||||
+1
-1
@@ -6955,7 +6955,7 @@ void Camera_Init(Camera* camera, View* view, CollisionContext* colCtx, PlayState
|
||||
s16 curUID;
|
||||
s16 j;
|
||||
|
||||
__osMemset(camera, 0, sizeof(Camera));
|
||||
memset(camera, 0, sizeof(Camera));
|
||||
|
||||
camera->play = sCamPlayState = play;
|
||||
curUID = sCameraNextUID;
|
||||
|
||||
+2
-1
@@ -65,6 +65,7 @@ Gfx* sSkyboxStarsDList;
|
||||
#include "objects/gameplay_keep/gameplay_keep.h"
|
||||
#include "objects/gameplay_field_keep/gameplay_field_keep.h"
|
||||
#include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
|
||||
#include "libc/string.h"
|
||||
|
||||
// Data
|
||||
f32 sSandstormLerpScale = 0.0f;
|
||||
@@ -1298,7 +1299,7 @@ void Environment_UpdateLights(PlayState* play, EnvironmentContext* envCtx, Light
|
||||
AdjLightSettings spA4[4];
|
||||
|
||||
var_fs3 = 0.0f;
|
||||
__osMemset(spA4, 0, sizeof(AdjLightSettings) * ARRAY_COUNT(spA4));
|
||||
memset(spA4, 0, sizeof(AdjLightSettings) * ARRAY_COUNT(spA4));
|
||||
lightSettingsList = play->envCtx.lightSettingsList;
|
||||
|
||||
if ((envCtx->lightSettingOverride != LIGHT_SETTING_OVERRIDE_NONE) &&
|
||||
|
||||
+2
-1
@@ -1,5 +1,6 @@
|
||||
#include "prevent_bss_reordering.h"
|
||||
#include "global.h"
|
||||
#include "libc/string.h"
|
||||
#include "z64quake.h"
|
||||
#include "z64view.h"
|
||||
|
||||
@@ -174,7 +175,7 @@ QuakeRequest* Quake_RequestImpl(Camera* camera, u32 type) {
|
||||
s16 index = Quake_GetFreeIndex();
|
||||
QuakeRequest* req = &sQuakeRequests[index];
|
||||
|
||||
__osMemset(req, 0, sizeof(QuakeRequest));
|
||||
memset(req, 0, sizeof(QuakeRequest));
|
||||
|
||||
req->camera = camera;
|
||||
req->camId = camera->camId;
|
||||
|
||||
Reference in New Issue
Block a user