mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-10-19 03:32:41 +00:00
Make new timers immutable
This commit is contained in:
parent
5b45e44b81
commit
033b11ac22
4 changed files with 10 additions and 2 deletions
|
@ -76,6 +76,8 @@ override_field_immutable = {
|
||||||
"Object": ["oSyncID", "coopFlags"],
|
"Object": ["oSyncID", "coopFlags"],
|
||||||
"GlobalObjectAnimations": [ "*"],
|
"GlobalObjectAnimations": [ "*"],
|
||||||
"SpawnParticlesInfo": [ "model" ],
|
"SpawnParticlesInfo": [ "model" ],
|
||||||
|
"MarioBodyState": [ "updateTorsoTime" ],
|
||||||
|
"Area": [ "localAreaTimer" ],
|
||||||
}
|
}
|
||||||
|
|
||||||
sLuaManuallyDefinedStructs = [
|
sLuaManuallyDefinedStructs = [
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
--- @field public flags integer
|
--- @field public flags integer
|
||||||
--- @field public index integer
|
--- @field public index integer
|
||||||
--- @field public instantWarps InstantWarp
|
--- @field public instantWarps InstantWarp
|
||||||
|
--- @field public localAreaTimer integer
|
||||||
--- @field public macroObjects Pointer_integer
|
--- @field public macroObjects Pointer_integer
|
||||||
--- @field public musicParam integer
|
--- @field public musicParam integer
|
||||||
--- @field public musicParam2 integer
|
--- @field public musicParam2 integer
|
||||||
|
@ -461,6 +462,7 @@
|
||||||
--- @field public punchState integer
|
--- @field public punchState integer
|
||||||
--- @field public torsoAngle Vec3s
|
--- @field public torsoAngle Vec3s
|
||||||
--- @field public torsoPos Vec3f
|
--- @field public torsoPos Vec3f
|
||||||
|
--- @field public updateTorsoTime integer
|
||||||
--- @field public wingFlutter integer
|
--- @field public wingFlutter integer
|
||||||
|
|
||||||
--- @class MarioState
|
--- @class MarioState
|
||||||
|
|
|
@ -110,6 +110,7 @@
|
||||||
| flags | `integer` | |
|
| flags | `integer` | |
|
||||||
| index | `integer` | |
|
| index | `integer` | |
|
||||||
| instantWarps | [InstantWarp](structs.md#InstantWarp) | |
|
| instantWarps | [InstantWarp](structs.md#InstantWarp) | |
|
||||||
|
| localAreaTimer | `integer` | read-only |
|
||||||
| macroObjects | `Pointer` <`integer`> | read-only |
|
| macroObjects | `Pointer` <`integer`> | read-only |
|
||||||
| musicParam | `integer` | |
|
| musicParam | `integer` | |
|
||||||
| musicParam2 | `integer` | |
|
| musicParam2 | `integer` | |
|
||||||
|
@ -710,6 +711,7 @@
|
||||||
| punchState | `integer` | |
|
| punchState | `integer` | |
|
||||||
| torsoAngle | [Vec3s](structs.md#Vec3s) | read-only |
|
| torsoAngle | [Vec3s](structs.md#Vec3s) | read-only |
|
||||||
| torsoPos | [Vec3f](structs.md#Vec3f) | read-only |
|
| torsoPos | [Vec3f](structs.md#Vec3f) | read-only |
|
||||||
|
| updateTorsoTime | `integer` | read-only |
|
||||||
| wingFlutter | `integer` | |
|
| wingFlutter | `integer` | |
|
||||||
|
|
||||||
[:arrow_up_small:](#)
|
[:arrow_up_small:](#)
|
||||||
|
|
|
@ -45,7 +45,7 @@ static struct LuaObjectField sAnimationFields[LUA_ANIMATION_FIELD_COUNT] = {
|
||||||
{ "values", LVT_S16_P, offsetof(struct Animation, values), true, LOT_POINTER },
|
{ "values", LVT_S16_P, offsetof(struct Animation, values), true, LOT_POINTER },
|
||||||
};
|
};
|
||||||
|
|
||||||
#define LUA_AREA_FIELD_COUNT 13
|
#define LUA_AREA_FIELD_COUNT 14
|
||||||
static struct LuaObjectField sAreaFields[LUA_AREA_FIELD_COUNT] = {
|
static struct LuaObjectField sAreaFields[LUA_AREA_FIELD_COUNT] = {
|
||||||
// { "cachedBehaviors", LOT_???, offsetof(struct Area, cachedBehaviors), false, LOT_??? }, <--- UNIMPLEMENTED
|
// { "cachedBehaviors", LOT_???, offsetof(struct Area, cachedBehaviors), false, LOT_??? }, <--- UNIMPLEMENTED
|
||||||
// { "cachedPositions", LOT_???, offsetof(struct Area, cachedPositions), false, LOT_??? }, <--- UNIMPLEMENTED
|
// { "cachedPositions", LOT_???, offsetof(struct Area, cachedPositions), false, LOT_??? }, <--- UNIMPLEMENTED
|
||||||
|
@ -54,6 +54,7 @@ static struct LuaObjectField sAreaFields[LUA_AREA_FIELD_COUNT] = {
|
||||||
{ "flags", LVT_S8, offsetof(struct Area, flags), false, LOT_NONE },
|
{ "flags", LVT_S8, offsetof(struct Area, flags), false, LOT_NONE },
|
||||||
{ "index", LVT_S8, offsetof(struct Area, index), false, LOT_NONE },
|
{ "index", LVT_S8, offsetof(struct Area, index), false, LOT_NONE },
|
||||||
{ "instantWarps", LVT_COBJECT_P, offsetof(struct Area, instantWarps), false, LOT_INSTANTWARP },
|
{ "instantWarps", LVT_COBJECT_P, offsetof(struct Area, instantWarps), false, LOT_INSTANTWARP },
|
||||||
|
{ "localAreaTimer", LVT_U32, offsetof(struct Area, localAreaTimer), true, LOT_NONE },
|
||||||
{ "macroObjects", LVT_S16_P, offsetof(struct Area, macroObjects), true, LOT_POINTER },
|
{ "macroObjects", LVT_S16_P, offsetof(struct Area, macroObjects), true, LOT_POINTER },
|
||||||
{ "musicParam", LVT_U16, offsetof(struct Area, musicParam), false, LOT_NONE },
|
{ "musicParam", LVT_U16, offsetof(struct Area, musicParam), false, LOT_NONE },
|
||||||
{ "musicParam2", LVT_U16, offsetof(struct Area, musicParam2), false, LOT_NONE },
|
{ "musicParam2", LVT_U16, offsetof(struct Area, musicParam2), false, LOT_NONE },
|
||||||
|
@ -543,7 +544,7 @@ static struct LuaObjectField sMarioAnimationFields[LUA_MARIO_ANIMATION_FIELD_COU
|
||||||
{ "targetAnim", LVT_COBJECT_P, offsetof(struct MarioAnimation, targetAnim), false, LOT_ANIMATION },
|
{ "targetAnim", LVT_COBJECT_P, offsetof(struct MarioAnimation, targetAnim), false, LOT_ANIMATION },
|
||||||
};
|
};
|
||||||
|
|
||||||
#define LUA_MARIO_BODY_STATE_FIELD_COUNT 12
|
#define LUA_MARIO_BODY_STATE_FIELD_COUNT 13
|
||||||
static struct LuaObjectField sMarioBodyStateFields[LUA_MARIO_BODY_STATE_FIELD_COUNT] = {
|
static struct LuaObjectField sMarioBodyStateFields[LUA_MARIO_BODY_STATE_FIELD_COUNT] = {
|
||||||
{ "action", LVT_U32, offsetof(struct MarioBodyState, action), false, LOT_NONE },
|
{ "action", LVT_U32, offsetof(struct MarioBodyState, action), false, LOT_NONE },
|
||||||
{ "capState", LVT_S8, offsetof(struct MarioBodyState, capState), false, LOT_NONE },
|
{ "capState", LVT_S8, offsetof(struct MarioBodyState, capState), false, LOT_NONE },
|
||||||
|
@ -557,6 +558,7 @@ static struct LuaObjectField sMarioBodyStateFields[LUA_MARIO_BODY_STATE_FIELD_CO
|
||||||
{ "punchState", LVT_U8, offsetof(struct MarioBodyState, punchState), false, LOT_NONE },
|
{ "punchState", LVT_U8, offsetof(struct MarioBodyState, punchState), false, LOT_NONE },
|
||||||
{ "torsoAngle", LVT_COBJECT, offsetof(struct MarioBodyState, torsoAngle), true, LOT_VEC3S },
|
{ "torsoAngle", LVT_COBJECT, offsetof(struct MarioBodyState, torsoAngle), true, LOT_VEC3S },
|
||||||
{ "torsoPos", LVT_COBJECT, offsetof(struct MarioBodyState, torsoPos), true, LOT_VEC3F },
|
{ "torsoPos", LVT_COBJECT, offsetof(struct MarioBodyState, torsoPos), true, LOT_VEC3F },
|
||||||
|
{ "updateTorsoTime", LVT_U32, offsetof(struct MarioBodyState, updateTorsoTime), true, LOT_NONE },
|
||||||
{ "wingFlutter", LVT_S8, offsetof(struct MarioBodyState, wingFlutter), false, LOT_NONE },
|
{ "wingFlutter", LVT_S8, offsetof(struct MarioBodyState, wingFlutter), false, LOT_NONE },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue