fixes somethigns

.github/workflows/main.yml

@@ -13,8 +13,6 @@ jobs:
             os: ubuntu-latest
           - identifier: windows
             os: ubuntu-latest
-          - identifier: macos
-            os: macos-latest
           - identifier: web
             os: ubuntu-latest
     runs-on: ${{ matrix.os }}
@@ -27,9 +25,13 @@ jobs:
         with:
           python-version: '3.10'
 
-      - name: (Windows) Set up MinGW
+      - name: (Windows) Install MinGW
         if: ${{ startsWith(matrix.identifier, 'windows') }}
-        uses: egor-tensin/setup-mingw@v2
+        run: |
+          sudo apt-get update -y -qq
+          sudo apt-get install -y mingw-w64
+          sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
+          sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
 
       - name: (Windows) Prepare cross compilation
         if: ${{ startsWith(matrix.identifier, 'windows') }}
@@ -42,7 +44,7 @@ jobs:
         run: |
           sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
           sudo apt-get update -y -qq
-          sudo apt-get install libsdl2-dev libglew-dev
+          sudo apt-get install -y libsdl2-dev libglew-dev
 
       - name: (Web) Set up Emscripten
         if: ${{ startsWith(matrix.identifier, 'web') }}
@@ -62,7 +64,7 @@ jobs:
           make test -j`nproc`
 
       - name: Upload build
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: libsm64_${{ matrix.identifier }}
           path: |
@@ -88,4 +90,4 @@ jobs:
   #        title: "Snapshot Build"
   #        files: |
   #         ./README.md
-  #         ./dist
+  #         ./dist

src/decomp/game/mario_misc.c

@@ -490,7 +490,12 @@ Gfx *geo_switch_mario_cap_effect(s32 callContext, struct GraphNode *node, UNUSED
     struct MarioBodyState *bodyState = &gBodyStates[switchCase->numCases];
 
     if (callContext == GEO_CONTEXT_RENDER) {
-        switchCase->selectedCase = bodyState->modelState >> 8;
+        // switchCase->selectedCase = bodyState->modelState >> 8;
+        if (bodyState->modelState >> 8 >= 2){ // temporarily disables metal cap
+            switchCase->selectedCase = 0;
+        } else {
+            switchCase->selectedCase = bodyState->modelState >> 8;
+        }
     }
     return NULL;
 }

src/libsm64.c

@@ -259,9 +259,7 @@ SM64_LIB_FN void sm64_mario_tick( int32_t marioId, const struct SM64MarioInputs
     outState->forwardVelocity = gMarioState->forwardVel;
     outState->action = gMarioState->action;
 
-    struct AnimInfo animInfo = gMarioState->marioObj->header.gfx.animInfo;
+    outState->animInfo = &gMarioState->marioObj->header.gfx.animInfo;
-    outState->animID = animInfo.animID;
-    outState->animFrame = animInfo.animFrame;
 
     outState->flags = gMarioState->flags;
     outState->particleFlags = gMarioState->particleFlags;

src/libsm64.h

@@ -61,8 +61,7 @@ struct SM64MarioState
     float forwardVelocity;
     int16_t health;
     uint32_t action;
-    int32_t animID;
+    struct AnimInfo* animInfo;
-    int16_t animFrame;
     uint32_t flags;
     uint32_t particleFlags;
     int16_t invincTimer;