Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 1 addition & 9 deletions src/_ZN14UnchainedChomp13InitResourcesEv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,7 @@

#include "SharedFilePtr.h"
#include "UnchainedChomp.h"

struct PathPtr {
char pad_00[8];

PathPtr();
void FromID(u32 id);
u32 NumNodes() const;
void GetNode(Vector3 &out, u32 index) const;
};
#include "PathPtr.h"

extern "C" {
void LoadSilverStarAndNumber();
Expand Down
9 changes: 1 addition & 8 deletions src/_ZN5Shark8BehaviorEv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// @symbol _ZN5Shark8BehaviorEv

#include "Shark.h"
#include "PathPtr.h"

struct SharkCallbackOwner;
typedef void (SharkCallbackOwner::*SharkCallback)();
Expand All @@ -11,14 +12,6 @@ struct SharkBehaviorState {
SharkCallback callback;
};

struct PathPtr {
char pad_00[8];

PathPtr();
void FromID(u32 id);
void GetNode(Vector3 &out, u32 index) const;
};

extern "C" {
u16 DecIfAbove0_Short(u16 *value);
void Vec3_Sub(Vector3 *out, Vector3 *a, Vector3 *b);
Expand Down
9 changes: 1 addition & 8 deletions src/_ZN8MantaRay13InitResourcesEv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,11 @@
* and a hardcoded position. That is a scripted placement, not a spawn.
*/
#include "MantaRay.h"
#include "PathPtr.h"
struct SharedFilePtr;
struct BMD_File;
struct dActor_c;

struct PathPtr {
char pad[8];
PathPtr();
void FromID(unsigned int id);
int NumNodes() const;
void GetNode(Vector3& out, unsigned int idx) const;
};

extern "C" {
BMD_File* _ZN5Model8LoadFileER13SharedFilePtr(SharedFilePtr& p);
int _ZN9ModelBase7SetFileEP8BMD_Fileii(void* self, BMD_File* f, int a, int b);
Expand Down
8 changes: 1 addition & 7 deletions src/_ZN8MantaRay8BehaviorEv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,11 @@
* are dActor_c's speed slots, repurposed as a vector.
*/
#include "MantaRay.h"
#include "PathPtr.h"
struct C3;
typedef void (C3::*Fn)();
struct Obj { char pad[8]; Fn fn; };

struct PathPtr {
char pad[8];
PathPtr();
void FromID(unsigned int id);
void GetNode(Vector3& out, unsigned int idx) const;
};

extern "C" {
unsigned short DecIfAbove0_Short(unsigned short* p);
void Vec3_Sub(Vector3* out, Vector3* a, Vector3* b);
Expand Down
5 changes: 1 addition & 4 deletions src/func_ov019_0211127c.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@
// @symbol func_ov019_0211127c
/* recovered: shared common types */
#include "common.h"
#include "PathPtr.h"

typedef int Fix12i;

struct PathPtr {
void GetNode(Vector3 &, unsigned int) const;
};

extern "C" Fix12i Vec3_HorzDist(const Vector3 *a, const Vector3 *b);

extern "C" int func_ov019_0211127c(char *c, Vector3 *arg, unsigned int j) {
Expand Down
9 changes: 1 addition & 8 deletions src/func_ov062_0211c2f4.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,7 @@
#include "decl_common.h"
/* recovered: shared common types */
#include "common.h"
struct PathPtr {
int a;
int b;
PathPtr();
void FromID(u32 id);
void GetNode(Vector3 &out, u32 idx) const;
};

#include "PathPtr.h"
extern "C" {
extern s16 Vec3_HorzAngle(const void *a, const void *b);
extern int ApproachAngle(void *p, int target, int a, int b, int c);
Expand Down
4 changes: 1 addition & 3 deletions src/func_ov092_021313b0.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
// @symbol func_ov092_021313b0
/* recovered: shared common types */
#include "common.h"
#include "PathPtr.h"
#define LA(p) (p)

struct PathPtr {
int GetNode(Vector3 &v, unsigned int i) const;
};
extern "C" s16 Vec3_HorzAngle(const struct Vector3 *v0, const struct Vector3 *v1);

extern "C" void func_ov092_021313b0(void *t) {
Expand Down
Loading