Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
51826ee
zTalkBox: Migrate weak functions from zEntPlayerOOBState
JoshSanch Dec 9, 2025
1b9681f
Configure zEntPlayerOOBState.cpp for sym on compiler flags
JoshSanch Dec 9, 2025
29b77cd
zEntPlayerOOBState: Initial match for render_model and 100% match for…
JoshSanch Dec 9, 2025
2f55221
zSurface: Add declaration for zSurfaceGetOutOfBoundsDelay
JoshSanch Dec 9, 2025
ca879a9
OOBState: Type cleanup in header structs
JoshSanch Dec 9, 2025
f2df61f
OOBState: Drop state function matches
JoshSanch Dec 10, 2025
dc45aba
xMath2: Correct return type of normal to xVec2
JoshSanch Dec 11, 2025
5cb7a0b
OOBState: drop_state_type update func matches
JoshSanch Dec 11, 2025
b9f3196
OOBState: Grab State/Tutorial Callback overhaul and matching
JoshSanch Dec 11, 2025
7eacb84
OOBState: Match grab_state_type functions and vtable
JoshSanch Dec 13, 2025
7b85ab9
OOBState: Additional matches with idiot_level_data fix
JoshSanch Dec 13, 2025
3374691
zSurface: Declare zSurfaceOutOfBounds from DWARF
JoshSanch Dec 13, 2025
bdfc7c9
OOBState: In & Out callback matches
JoshSanch Dec 13, 2025
822fddb
OOBState: Progress on start/stop/update funcs
JoshSanch Dec 14, 2025
d8c7e4e
zEntPlayer: Add declaration for zEntPlayerUpdateModel
JoshSanch Dec 15, 2025
dd58967
OOBState: Matches for grab and drop state type update loop functions
JoshSanch Dec 15, 2025
38ad3df
OOBState: Match oob_state::update
JoshSanch Dec 15, 2025
296fdcd
OOBState: Match progress for init func
JoshSanch Dec 15, 2025
0d8b23f
OOBState: Migrate remaining weak functions
JoshSanch Dec 15, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ def MatchingFor(*versions):
Object(Matching, "SB/Core/x/xVolume.cpp"),
Object(NonMatching, "SB/Core/x/xParEmitterType.cpp"),
Object(Matching, "SB/Core/x/xRenderState.cpp"),
Object(NonMatching, "SB/Game/zEntPlayerOOBState.cpp"),
Object(NonMatching, "SB/Game/zEntPlayerOOBState.cpp", extra_cflags=["-sym on"]),
Object(Equivalent, "SB/Core/x/xClumpColl.cpp"),
Object(NonMatching, "SB/Core/x/xEntBoulder.cpp"),
Object(NonMatching, "SB/Core/x/xGrid.cpp"),
Expand Down
19 changes: 16 additions & 3 deletions src/SB/Core/x/xMath2.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,22 @@ struct xVec2
xVec2& assign(F32 x, F32 y);
F32 length() const;
F32 length2() const;
F32 normal() const;
xVec2& normalize();
F32 dot(const xVec2&) const;
xVec2 normal() const
{
xVec2 tmp = *this;
return tmp.normalize();
}

xVec2& normalize()
{
*this /= length();
return *this;
}

F32 dot(const xVec2& b) const
{
return (x * b.x) + (y * b.y);
}

xVec2& operator=(F32);
xVec2 operator*(F32) const;
Expand Down
1 change: 1 addition & 0 deletions src/SB/Game/zEntPlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ void zEntPlayer_Init(xEnt* ent, xEntAsset* asset);
void zEntPlayerExit(xEnt*);
void zEntPlayerPreReset();
void zEntPlayerReset(xEnt* ent);
void zEntPlayerUpdateModel();
void zEntPlayer_LoadSounds();
void zEntPlayer_UnloadSounds();
void zEntPlayer_ShadowModelEnable();
Expand Down
Loading