:(
This commit is contained in:
+7
-10
@@ -28,13 +28,8 @@ extern "C"
|
||||
#include "audio.h"
|
||||
#include "sm64.h"
|
||||
|
||||
#include "../src/decomp/include/types.h"
|
||||
|
||||
// Add this include near the top, after libsm64.h
|
||||
// AnimInfo is defined in the decomp headers, not the public API
|
||||
#include "../src/decomp/include/types.h" // or wherever AnimInfo is fully defined in your tree
|
||||
|
||||
// -------------------------------------------------------
|
||||
// Named struct so it can be used as a parameter type
|
||||
struct FlagEntry
|
||||
{
|
||||
uint32_t bit;
|
||||
@@ -568,9 +563,6 @@ static const char *GetActionName(uint32_t action)
|
||||
}
|
||||
}
|
||||
|
||||
// -------------------------------------------------------
|
||||
// All helpers defined BEFORE DrawMarioState
|
||||
|
||||
static void DrawBitFlags(
|
||||
const char *label, uint32_t value,
|
||||
const FlagEntry *table, int count)
|
||||
@@ -776,8 +768,13 @@ static void Rumble(int32_t marioId, int16_t level, int16_t time)
|
||||
SDL_HapticRumblePlay(gHaptic, strength, duration);
|
||||
}
|
||||
|
||||
#ifdef WINDOWS_BUILD
|
||||
constexpr float M_PI = 3.14159265358979323846f;
|
||||
#endif
|
||||
|
||||
int main(void)
|
||||
{
|
||||
SDL_SetMainReady();
|
||||
size_t romSize;
|
||||
|
||||
uint8_t *rom = utils_read_file_alloc("baserom.us.z64", &romSize);
|
||||
@@ -798,7 +795,7 @@ int main(void)
|
||||
sm64_register_rumble_callback_function(Rumble);
|
||||
|
||||
sm64_static_surfaces_load(surfaces, surfaces_count);
|
||||
int32_t marioId = sm64_mario_create(-6558, 0, 6464);
|
||||
int32_t marioId = sm64_mario_create(-6558, 0, 6464, true);
|
||||
|
||||
int thing = sm64_fake_object_create(-6558.0f, 0.0f, 6200.0f, 1);
|
||||
sm64_fake_object_set_hitbox(thing, 32.0f, 800.0f * 2, 800);
|
||||
|
||||
Reference in New Issue
Block a user