diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2024-01-18 20:06:10 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-18 16:06:10 -0700 |
| commit | 7606ac4586b9ce976dcf7978a9fe3b7e58d1c727 (patch) | |
| tree | e7e4f0901d7b2243f4a6057b15faa155924da1bb /src/code | |
| parent | ef3e9edf8ad84b4f6761b53a400b4f77f767a060 (diff) | |
Setup venv on Jenkinsfile (#135)
* Add venv to Jenkinsfile
* Add readme instructions to venv
* z64compress warning
* fix warnings
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/m_lib.c | 4 | ||||
| -rw-r--r-- | src/code/m_npc.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/code/m_lib.c b/src/code/m_lib.c index f39845d..6529fe3 100644 --- a/src/code/m_lib.c +++ b/src/code/m_lib.c @@ -595,7 +595,7 @@ void none_proc2(Actor* actor UNUSED, Game_Play* play UNUSED) { void Cheap_gfx_display(Game_Play* play, Gfx* dl) { //! FAKE - if ((!(&play->state)) && (!(&play->state))) {} + if (1) {} OPEN_DISPS(play->state.gfxCtx); @@ -610,7 +610,7 @@ void Cheap_gfx_display(Game_Play* play, Gfx* dl) { void Cheap_gfx_display_xlu(Game_Play* play, Gfx* dl) { //! FAKE - if ((!(&play->state)) && (!(&play->state))) {} + if (1) {} OPEN_DISPS(play->state.gfxCtx); diff --git a/src/code/m_npc.c b/src/code/m_npc.c index d1308b5..b1e4347 100644 --- a/src/code/m_npc.c +++ b/src/code/m_npc.c @@ -408,7 +408,7 @@ void mNpc_SetAnimalLastTalk(Animal_c* animal) { Anmmem_c* memory = NULL; s32 memoryIdx; - if ((&common_data.privateInfo->playerId != NULL) && (animal != NULL)) { + if (((uintptr_t)&common_data.privateInfo->playerId != NULL) && (animal != NULL)) { priv = common_data.privateInfo; memoryIdx = mNpc_GetAnimalMemoryIdx(&priv->playerId, animal->memories, ANIMAL_MEMORY_NUM); |