diff --git a/Game_8cpp.html b/Game_8cpp.html index 148acc246..7a3b0626f 100644 --- a/Game_8cpp.html +++ b/Game_8cpp.html @@ -923,7 +923,7 @@ Here is the caller graph for this function:
Here is the call graph for this function:
-
+
Here is the caller graph for this function:
@@ -2632,7 +2632,7 @@ Here is the caller graph for this function:
-
Todo
Move gGfxPool out of main.h
+
Todo
Move gGfxPool out of main.h
Here is the call graph for this function:
diff --git a/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph.map b/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph.map index a67c54fd2..351e22b73 100644 --- a/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph.map +++ b/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph.map @@ -10,8 +10,8 @@ - - + + @@ -97,21 +97,21 @@ - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph.md5 b/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph.md5 index 2d9068e13..386adff31 100644 --- a/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph.md5 +++ b/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph.md5 @@ -1 +1 @@ -ba21db8fca64dea3e2e7bed4ce44804b \ No newline at end of file +6b2618d51cc07779a12d185438269f1b \ No newline at end of file diff --git a/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph.svg b/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph.svg index 4689f5cac..b121341ec 100644 --- a/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph.svg +++ b/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph.svg @@ -154,19 +154,19 @@ var sectionId = 'dynsection-200'; - - -Node1794 - + + +Node1795 + thread5_game_loop - - -Node1->Node1794 - + + +Node1->Node1795 + @@ -937,64 +937,64 @@ var sectionId = 'dynsection-200'; - - -Node1794->Node1638 - + + +Node1795->Node1638 + - - -Node1795 - - -clear_nmi_buffer - - - - - -Node1794->Node1795 - - - - - - Node1796 - - -func_800C5CB8 + + +clear_nmi_buffer - - -Node1794->Node1796 - - - + + +Node1795->Node1796 + + + Node1797 - + + +func_800C5CB8 + + + + + +Node1795->Node1797 + + + + + + + + +Node1798 + init_controllers - - -Node1794->Node1797 - + + +Node1795->Node1798 + @@ -1009,82 +1009,82 @@ var sectionId = 'dynsection-200'; - - -Node1794->Node416 - + + +Node1795->Node416 + - - -Node1802 - - -rendering_init - - - - - -Node1794->Node1802 - - - - - - Node1803 - + + +rendering_init + + + + + +Node1795->Node1803 + + + + + + + + +Node1804 + setup_game_memory - - -Node1794->Node1803 - + + +Node1795->Node1804 + - - -Node1796->Node120 - + + +Node1797->Node120 + - - -Node1797->Node416 - + + +Node1798->Node416 + - - -Node1802->Node71 - + + +Node1803->Node71 + - - -Node1802->Node92 - + + +Node1803->Node92 + diff --git a/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph_org.svg b/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph_org.svg index 3aef68e59..aefee1a88 100644 --- a/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph_org.svg +++ b/Game_8cpp_a0ddf1224851353fc92bfbff6f499fa97_cgraph_org.svg @@ -107,19 +107,19 @@ - - -Node1794 - + + +Node1795 + thread5_game_loop - - -Node1->Node1794 - + + +Node1->Node1795 + @@ -890,64 +890,64 @@ - - -Node1794->Node1638 - + + +Node1795->Node1638 + - - -Node1795 - - -clear_nmi_buffer - - - - - -Node1794->Node1795 - - - - - - Node1796 - - -func_800C5CB8 + + +clear_nmi_buffer - - -Node1794->Node1796 - - - + + +Node1795->Node1796 + + + Node1797 - + + +func_800C5CB8 + + + + + +Node1795->Node1797 + + + + + + + + +Node1798 + init_controllers - - -Node1794->Node1797 - + + +Node1795->Node1798 + @@ -962,82 +962,82 @@ - - -Node1794->Node416 - + + +Node1795->Node416 + - - -Node1802 - - -rendering_init - - - - - -Node1794->Node1802 - - - - - - Node1803 - + + +rendering_init + + + + + +Node1795->Node1803 + + + + + + + + +Node1804 + setup_game_memory - - -Node1794->Node1803 - + + +Node1795->Node1804 + - - -Node1796->Node120 - + + +Node1797->Node120 + - - -Node1797->Node416 - + + +Node1798->Node416 + - - -Node1802->Node71 - + + +Node1803->Node71 + - - -Node1802->Node92 - + + +Node1803->Node92 + diff --git a/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph.map b/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph.map index 8127db3da..52320eafa 100644 --- a/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph.map +++ b/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph.map @@ -101,6 +101,6 @@ - - + + diff --git a/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph.md5 b/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph.md5 index b9a6b6756..075219625 100644 --- a/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph.md5 +++ b/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph.md5 @@ -1 +1 @@ -2bfab4a76b1c3fa8a2c3e154a2b4cd68 \ No newline at end of file +36296d463146c799a6015bf0b9e2739f \ No newline at end of file diff --git a/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph.svg b/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph.svg index 327993965..6989c2634 100644 --- a/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph.svg +++ b/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph.svg @@ -976,19 +976,19 @@ var sectionId = 'dynsection-202'; - - -Node1714 - + + +Node1715 + setup_podium_ceremony - - -Node1658->Node1714 - + + +Node1658->Node1715 + diff --git a/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph_org.svg b/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph_org.svg index a7987162f..f0126acb0 100644 --- a/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph_org.svg +++ b/Game_8cpp_a7e10f41e410b6fdab17e0388f164f61d_cgraph_org.svg @@ -929,19 +929,19 @@ - - -Node1714 - + + +Node1715 + setup_podium_ceremony - - -Node1658->Node1714 - + + +Node1658->Node1715 + diff --git a/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.map b/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.map index b123f71cd..2541971da 100644 --- a/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.map +++ b/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.map @@ -1,9 +1,13 @@ - - - - - - - + + + + + + + + + + + diff --git a/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.md5 b/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.md5 index ecd4f6054..abd67ba5f 100644 --- a/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.md5 +++ b/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.md5 @@ -1 +1 @@ -32517ab2efc49dd1435d18d4c072bdd5 \ No newline at end of file +e9429009d4d634b697b963bdeb85fb66 \ No newline at end of file diff --git a/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.svg b/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.svg index 1f00d4538..7edfb2ac0 100644 --- a/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.svg +++ b/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.svg @@ -4,8 +4,8 @@ - + @@ -17,23 +17,23 @@ ]]> - + CM_BeginPlay Node1 - -CM_BeginPlay + +CM_BeginPlay Node2 - - -World::GetRaceManager + + +World::CleanActors @@ -41,35 +41,17 @@ Node1->Node2 - - - - - - - -Node3 - - -World::GetTrack - - - - - -Node1->Node3 - - - + + Node4 - - -GetWorld + + +World::GetRaceManager @@ -77,8 +59,62 @@ Node1->Node4 - - + + + + + + + +Node5 + + +World::GetTrack + + + + + +Node1->Node5 + + + + + + + + +Node6 + + +GetWorld + + + + + +Node1->Node6 + + + + + + + + +Node3 + + +World::Reset + + + + + +Node2->Node3 + + + diff --git a/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph_org.svg b/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph_org.svg index 118f991fa..0d11ec064 100644 --- a/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph_org.svg +++ b/Game_8cpp_a88c0d93fc49776f7a5c145312f4f81a0_cgraph_org.svg @@ -4,25 +4,25 @@ - - + + CM_BeginPlay Node1 - -CM_BeginPlay + +CM_BeginPlay Node2 - - -World::GetRaceManager + + +World::CleanActors @@ -30,35 +30,17 @@ Node1->Node2 - - - - - - - -Node3 - - -World::GetTrack - - - - - -Node1->Node3 - - - + + Node4 - - -GetWorld + + +World::GetRaceManager @@ -66,8 +48,62 @@ Node1->Node4 - - + + + + + + + +Node5 + + +World::GetTrack + + + + + +Node1->Node5 + + + + + + + + +Node6 + + +GetWorld + + + + + +Node1->Node6 + + + + + + + + +Node3 + + +World::Reset + + + + + +Node2->Node3 + + + diff --git a/Game_8h.html b/Game_8h.html index e8b027165..295d2038e 100644 --- a/Game_8h.html +++ b/Game_8h.html @@ -861,7 +861,7 @@ Here is the caller graph for this function:
Here is the call graph for this function:
-
+
Here is the caller graph for this function:
@@ -2545,7 +2545,7 @@ Here is the caller graph for this function:
-
Todo
Move gGfxPool out of main.h
+
Todo
Move gGfxPool out of main.h
diff --git a/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.map b/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.map index b123f71cd..2541971da 100644 --- a/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.map +++ b/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.map @@ -1,9 +1,13 @@ - - - - - - - + + + + + + + + + + + diff --git a/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.md5 b/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.md5 index ecd4f6054..abd67ba5f 100644 --- a/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.md5 +++ b/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.md5 @@ -1 +1 @@ -32517ab2efc49dd1435d18d4c072bdd5 \ No newline at end of file +e9429009d4d634b697b963bdeb85fb66 \ No newline at end of file diff --git a/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.svg b/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.svg index 1f00d4538..7edfb2ac0 100644 --- a/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.svg +++ b/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph.svg @@ -4,8 +4,8 @@ - + @@ -17,23 +17,23 @@ ]]> - + CM_BeginPlay Node1 - -CM_BeginPlay + +CM_BeginPlay Node2 - - -World::GetRaceManager + + +World::CleanActors @@ -41,35 +41,17 @@ Node1->Node2 - - - - - - - -Node3 - - -World::GetTrack - - - - - -Node1->Node3 - - - + + Node4 - - -GetWorld + + +World::GetRaceManager @@ -77,8 +59,62 @@ Node1->Node4 - - + + + + + + + +Node5 + + +World::GetTrack + + + + + +Node1->Node5 + + + + + + + + +Node6 + + +GetWorld + + + + + +Node1->Node6 + + + + + + + + +Node3 + + +World::Reset + + + + + +Node2->Node3 + + + diff --git a/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph_org.svg b/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph_org.svg index 118f991fa..0d11ec064 100644 --- a/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph_org.svg +++ b/Game_8h_a88c0d93fc49776f7a5c145312f4f81a0_cgraph_org.svg @@ -4,25 +4,25 @@ - - + + CM_BeginPlay Node1 - -CM_BeginPlay + +CM_BeginPlay Node2 - - -World::GetRaceManager + + +World::CleanActors @@ -30,35 +30,17 @@ Node1->Node2 - - - - - - - -Node3 - - -World::GetTrack - - - - - -Node1->Node3 - - - + + Node4 - - -GetWorld + + +World::GetRaceManager @@ -66,8 +48,62 @@ Node1->Node4 - - + + + + + + + +Node5 + + +World::GetTrack + + + + + +Node1->Node5 + + + + + + + + +Node6 + + +GetWorld + + + + + +Node1->Node6 + + + + + + + + +Node3 + + +World::Reset + + + + + +Node2->Node3 + + + diff --git a/World_8h_source.html b/World_8h_source.html index 1723d873a..58b7c92c3 100644 --- a/World_8h_source.html +++ b/World_8h_source.html @@ -220,37 +220,38 @@ $(function(){initNavTree('World_8h_source.html',''); initResizable(true); });
103
104 World* GetWorld(void);
105 void CleanWorld(void);
-
106
-
107 // getter/setter for current track
-
-
108 Track* GetTrack() {
-
109 return mTrack.get();
-
110 }
+
106 void CleanActors(void);
+
107
+
108 // getter/setter for current track
+
+
109 Track* GetTrack() {
+
110 return mTrack.get();
+
111 }
-
111
-
112 void SetCurrentTrack(std::unique_ptr<Track> track);
-
113
-
114 Matrix Mtx;
-
115
-
116 std::vector<Cup*> Cups;
-
117 size_t CupIndex = 1;
-
118
-
119 std::vector<std::unique_ptr<GameCamera>> Cameras;
-
120
-
121 std::vector<std::unique_ptr<StaticMeshActor>> StaticMeshActors;
-
122 std::vector<std::unique_ptr<AActor>> Actors;
-
123 std::deque<std::unique_ptr<OObject>> Objects;
-
124 std::vector<std::unique_ptr<ParticleEmitter>> Emitters;
-
125
-
126 std::unordered_map<s32, OLakitu*> Lakitus;
-
127
-
129 PlayerBombKart mPlayerBombKart[4]; // Used in battle mode
-
130
-
131 TrainCrossing* AddCrossing(Vec3f position, u32 waypointMin, u32 waypointMax, f32 approachRadius, f32 exitRadius);
-
132 std::vector<std::shared_ptr<TrainCrossing>> Crossings;
-
133private:
-
134 std::unique_ptr<RaceManager> RaceManagerInstance;
-
135};
+
112
+
113 void SetCurrentTrack(std::unique_ptr<Track> track);
+
114
+
115 Matrix Mtx;
+
116
+
117 std::vector<Cup*> Cups;
+
118 size_t CupIndex = 1;
+
119
+
120 std::vector<std::unique_ptr<GameCamera>> Cameras;
+
121
+
122 std::vector<std::unique_ptr<StaticMeshActor>> StaticMeshActors;
+
123 std::vector<std::unique_ptr<AActor>> Actors;
+
124 std::deque<std::unique_ptr<OObject>> Objects;
+
125 std::vector<std::unique_ptr<ParticleEmitter>> Emitters;
+
126
+
127 std::unordered_map<s32, OLakitu*> Lakitus;
+
128
+
130 PlayerBombKart mPlayerBombKart[4]; // Used in battle mode
+
131
+
132 TrainCrossing* AddCrossing(Vec3f position, u32 waypointMin, u32 waypointMax, f32 approachRadius, f32 exitRadius);
+
133 std::vector<std::shared_ptr<TrainCrossing>> Crossings;
+
134private:
+
135 std::unique_ptr<RaceManager> RaceManagerInstance;
+
136};
Actor.h
CoreMath.h
@@ -281,22 +282,23 @@ $(function(){initNavTree('World_8h_source.html',''); initResizable(true); });
TrainCrossing
TrainCrossing class.
Definition TrainCrossing.h:18
World::TickObjects
void TickObjects()
Definition World.cpp:205
World::ActorBeginPlay
void ActorBeginPlay(Actor *actor)
Definition World.cpp:132
-
World::GetTrack
Track * GetTrack()
Definition World.h:108
+
World::CleanActors
void CleanActors(void)
Definition World.cpp:277
+
World::GetTrack
Track * GetTrack()
Definition World.h:109
World::Reset
void Reset(void)
Definition World.cpp:243
-
World::Lakitus
std::unordered_map< s32, OLakitu * > Lakitus
Definition World.h:126
+
World::Lakitus
std::unordered_map< s32, OLakitu * > Lakitus
Definition World.h:127
World::AddBaseActor
struct Actor * AddBaseActor()
Definition World.cpp:123
-
World::Objects
std::deque< std::unique_ptr< OObject > > Objects
Definition World.h:123
+
World::Objects
std::deque< std::unique_ptr< OObject > > Objects
Definition World.h:124
World::SetCurrentCup
void SetCurrentCup(Cup *cup)
Definition World.cpp:92
World::GetCurrentCup
Cup * GetCurrentCup()
Definition World.h:95
World::AddStaticMeshActor
StaticMeshActor * AddStaticMeshActor(const std::string &name, FVector pos, IRotator rot, FVector scale, const std::string &model, int32_t *collision)
Definition World.cpp:169
World::GetWorld
World * GetWorld(void)
-
World::CupIndex
size_t CupIndex
Definition World.h:117
+
World::CupIndex
size_t CupIndex
Definition World.h:118
World::CurrentCup
Cup * CurrentCup
Definition World.h:57
-
World::Cameras
std::vector< std::unique_ptr< GameCamera > > Cameras
Definition World.h:119
+
World::Cameras
std::vector< std::unique_ptr< GameCamera > > Cameras
Definition World.h:120
World::ConvertAActorToActor
Actor * ConvertAActorToActor(AActor *actor)
Definition World.cpp:150
World::AddCup
void AddCup(Cup *cup)
Definition World.cpp:35
-
World::Crossings
std::vector< std::shared_ptr< TrainCrossing > > Crossings
Definition World.h:132
-
World::Emitters
std::vector< std::unique_ptr< ParticleEmitter > > Emitters
Definition World.h:124
+
World::Crossings
std::vector< std::shared_ptr< TrainCrossing > > Crossings
Definition World.h:133
+
World::Emitters
std::vector< std::unique_ptr< ParticleEmitter > > Emitters
Definition World.h:125
World::SetRaceManager
void SetRaceManager(std::unique_ptr< RaceManager > manager)
Definition World.h:65
World::CleanWorld
void CleanWorld(void)
Definition World.cpp:258
World::DrawParticles
void DrawParticles(s32 cameraId)
Definition World.cpp:236
@@ -307,27 +309,27 @@ $(function(){initNavTree('World_8h_source.html',''); initResizable(true); });
World::ConvertActorToAActor
AActor * ConvertActorToAActor(Actor *actor)
Definition World.cpp:140
World::SetCupIndex
void SetCupIndex(size_t index)
Definition World.cpp:88
World::GetObjectByIndex
Object * GetObjectByIndex(size_t)
Definition World.cpp:249
-
World::Cups
std::vector< Cup * > Cups
Definition World.h:116
+
World::Cups
std::vector< Cup * > Cups
Definition World.h:117
World::TickCameras
void TickCameras()
Definition World.cpp:99
World::TickObjects60fps
void TickObjects60fps()
Definition World.cpp:213
World::AddCrossing
TrainCrossing * AddCrossing(Vec3f position, u32 waypointMin, u32 waypointMax, f32 approachRadius, f32 exitRadius)
Definition World.cpp:46
World::GetCupIndex
u32 GetCupIndex()
Definition World.cpp:53
-
World::Actors
std::vector< std::unique_ptr< AActor > > Actors
Definition World.h:122
+
World::Actors
std::vector< std::unique_ptr< AActor > > Actors
Definition World.h:123
World::GetActor
AActor * GetActor(size_t index)
Definition World.cpp:156
World::NextCup
u32 NextCup()
Definition World.cpp:57
World::GetCupName
const char * GetCupName()
-
World::RaceManagerInstance
std::unique_ptr< RaceManager > RaceManagerInstance
Definition World.h:134
+
World::RaceManagerInstance
std::unique_ptr< RaceManager > RaceManagerInstance
Definition World.h:135
World::AddActor
AActor * AddActor(std::unique_ptr< AActor > actor)
Definition World.cpp:117
-
World::mPlayerBombKart
PlayerBombKart mPlayerBombKart[4]
Definition World.h:129
+
World::mPlayerBombKart
PlayerBombKart mPlayerBombKart[4]
Definition World.h:130
World::mTrack
std::unique_ptr< Track > mTrack
Definition World.h:56
World::Instance
static World * Instance
Definition World.h:60
-
World::Mtx
Matrix Mtx
Definition World.h:114
+
World::Mtx
Matrix Mtx
Definition World.h:115
World::DrawObjects
void DrawObjects(s32 cameraId)
Definition World.cpp:224
World::DrawStaticMeshActors
void DrawStaticMeshActors()
Definition World.cpp:175
World::TickParticles
void TickParticles()
Definition World.cpp:230
World::SetCurrentTrack
void SetCurrentTrack(std::unique_ptr< Track > track)
Definition World.cpp:39
World::AddEmitter
ParticleEmitter * AddEmitter(std::unique_ptr< ParticleEmitter > emitter)
Definition World.cpp:219
-
World::StaticMeshActors
std::vector< std::unique_ptr< StaticMeshActor > > StaticMeshActors
Definition World.h:121
+
World::StaticMeshActors
std::vector< std::unique_ptr< StaticMeshActor > > StaticMeshActors
Definition World.h:122
World::GetRaceManager
RaceManager & GetRaceManager()
Definition World.h:64
World::World
World()
Definition World.cpp:26
Vec3f
f32 Vec3f[3]
Definition common_structs.h:10
diff --git a/actors_8c.html b/actors_8c.html index 91268c36a..106e5ee77 100644 --- a/actors_8c.html +++ b/actors_8c.html @@ -456,7 +456,7 @@ Here is the caller graph for this function:
-
Todo
Commented out because deletes too soon.
+
Todo
Commented out because deletes too soon.
Here is the call graph for this function:
@@ -1369,7 +1369,7 @@ Here is the caller graph for this function:
Here is the call graph for this function:
-
+
Here is the caller graph for this function:
@@ -1861,7 +1861,7 @@ Here is the caller graph for this function:
-
Todo
actorType needs to be passed into this function for flexibility
+
Todo
actorType needs to be passed into this function for flexibility
Here is the call graph for this function:
diff --git a/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph.map b/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph.map index cd238eee1..7760faa0e 100644 --- a/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph.map +++ b/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph.map @@ -1,18 +1,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph.md5 b/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph.md5 index fb53f2465..b130d8c93 100644 --- a/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph.md5 +++ b/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph.md5 @@ -1 +1 @@ -3c6166e1ae67b4b2c5b7cc3a27ad2208 \ No newline at end of file +28c7c498957f4adfe64c1e62d5b5d7f8 \ No newline at end of file diff --git a/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph.svg b/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph.svg index cf2186fe8..039568c1e 100644 --- a/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph.svg +++ b/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph.svg @@ -4,7 +4,7 @@ - + @@ -47,8 +47,8 @@ @@ -83,37 +83,37 @@ var sectionId = 'dynsection-56'; - - -Node6 - + + +Node8 + destroy_all_actors - - -Node1->Node6 - + + +Node1->Node8 + - - -Node8 - + + +Node10 + init_red_shell_texture - - -Node1->Node8 - + + +Node1->Node10 + @@ -122,9 +122,9 @@ var sectionId = 'dynsection-56'; Node3 - - -World::GetRaceManager + + +World::CleanActors @@ -132,35 +132,17 @@ var sectionId = 'dynsection-56'; Node2->Node3 - - - - - - - -Node4 - - -World::GetTrack - - - - - -Node2->Node4 - - - + + Node5 - - -GetWorld + + +World::GetRaceManager @@ -168,35 +150,89 @@ var sectionId = 'dynsection-56'; Node2->Node5 - - + + + + + + + +Node6 + + +World::GetTrack + + + + + +Node2->Node6 + + + Node7 - - -CM_GetActor + + +GetWorld - - -Node6->Node7 - - - + + +Node2->Node7 + + + - - -Node7->Node5 - - - + + +Node4 + + +World::Reset + + + + + +Node3->Node4 + + + + + + + + +Node9 + + +CM_GetActor + + + + + +Node8->Node9 + + + + + + + + +Node9->Node7 + + + diff --git a/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph_org.svg b/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph_org.svg index 7c963c44b..d4955a45c 100644 --- a/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph_org.svg +++ b/actors_8c_a142a32371ea62d0303702286b839bdfd_cgraph_org.svg @@ -4,9 +4,9 @@ - - + + init_actors_and_load_textures @@ -36,37 +36,37 @@ - - -Node6 - + + +Node8 + destroy_all_actors - - -Node1->Node6 - + + +Node1->Node8 + - - -Node8 - + + +Node10 + init_red_shell_texture - - -Node1->Node8 - + + +Node1->Node10 + @@ -75,9 +75,9 @@ Node3 - - -World::GetRaceManager + + +World::CleanActors @@ -85,35 +85,17 @@ Node2->Node3 - - - - - - - -Node4 - - -World::GetTrack - - - - - -Node2->Node4 - - - + + Node5 - - -GetWorld + + +World::GetRaceManager @@ -121,35 +103,89 @@ Node2->Node5 - - + + + + + + + +Node6 + + +World::GetTrack + + + + + +Node2->Node6 + + + Node7 - - -CM_GetActor + + +GetWorld - - -Node6->Node7 - - - + + +Node2->Node7 + + + - - -Node7->Node5 - - - + + +Node4 + + +World::Reset + + + + + +Node3->Node4 + + + + + + + + +Node9 + + +CM_GetActor + + + + + +Node8->Node9 + + + + + + + + +Node9->Node7 + + + diff --git a/bug.html b/bug.html index 697bf572e..217b1ce05 100644 --- a/bug.html +++ b/bug.html @@ -118,7 +118,7 @@ $(function(){initNavTree('bug.html',''); initResizable(true); });
Global func_800B9BE4 (f32, f32, u16 *)
they probably meant to store the value to tmp[i] and tmp[8 + i]
Global func_800BB388 (s32 bankId, s32 instId, s32 arg2)
-
missing return
+
missing return
Global init_sequence_players (void)
Size of wrong array. Zeroes out second half of gSequenceChannels[0], all of gSequenceChannels[1..31], and part of gSequenceLayers[0]. However, this is only called at startup, so it's harmless.
Global new_actor (ActorInitParams *)
@@ -126,9 +126,9 @@ $(function(){initNavTree('bug.html',''); initResizable(true); });

Global note_set_vel_pan_reverb (struct Note *note, f32 velocity, u8 pan, u8 reverbVol)
-
for the change to UQ0.7, the if statement should also have been changed accordingly
+
for the change to UQ0.7, the if statement should also have been changed accordingly
Global preload_sequence (u32, u8)
-
should be IS_SEQ_LOAD_COMPLETE
+
should be IS_SEQ_LOAD_COMPLETE
Global render_menu_item_data_course_image (MenuItem *)
todo: This function will not work in custom courses.
Global setup_podium_ceremony (void)
diff --git a/ceremony__and__credits_8c.html b/ceremony__and__credits_8c.html index 240c932f4..995bbfc9f 100644 --- a/ceremony__and__credits_8c.html +++ b/ceremony__and__credits_8c.html @@ -1363,7 +1363,7 @@ Here is the caller graph for this function:
-
Todo
Does this match as a return of s8?
+
Todo
Does this match as a return of s8?
Here is the call graph for this function:
@@ -2099,7 +2099,7 @@ Here is the call graph for this function:
-
Todo
What does this even do?
+
Todo
What does this even do?
Here is the call graph for this function:
diff --git a/ceremony__and__credits_8h.html b/ceremony__and__credits_8h.html index a86dec0d1..40e7791dc 100644 --- a/ceremony__and__credits_8h.html +++ b/ceremony__and__credits_8h.html @@ -2037,7 +2037,7 @@ Here is the call graph for this function:
-
Todo
What does this even do?
+
Todo
What does this even do?
Here is the call graph for this function:
diff --git a/classOSnowman.html b/classOSnowman.html index a72a6f353..0ad66ee75 100644 --- a/classOSnowman.html +++ b/classOSnowman.html @@ -351,7 +351,7 @@ Here is the call graph for this function:
-
Todo
quick hack to add the snow particles on hit. Need to separate into its own class
+
Todo
quick hack to add the snow particles on hit. Need to separate into its own class
Here is the call graph for this function:
@@ -782,7 +782,7 @@ Here is the call graph for this function:
-
Todo
quick hack to add the snow particles on hit. Need to separate into its own class
+
Todo
quick hack to add the snow particles on hit. Need to separate into its own class

Reimplemented from OObject.

diff --git a/classWorld.html b/classWorld.html index f0c0e1603..b9bf03ed4 100644 --- a/classWorld.html +++ b/classWorld.html @@ -195,6 +195,8 @@ Public Member Functions   void CleanWorld (void)   +void CleanActors (void) +  Track * GetTrack ()   void SetCurrentTrack (std::unique_ptr< Track > track) @@ -517,6 +519,33 @@ Here is the caller graph for this function:
+ + + +

◆ CleanActors()

+ +
+
+ + + + + + + +
void World::CleanActors (void )
+
+
+Here is the call graph for this function:
+
+
+
+
+Here is the caller graph for this function:
+
+
+
+
diff --git a/classWorld.js b/classWorld.js index 798eaf25a..deeb6b6a9 100644 --- a/classWorld.js +++ b/classWorld.js @@ -11,6 +11,7 @@ var classWorld = [ "AddEmitter", "classWorld.html#af413993592605f0fe61d2114dd0491bb", null ], [ "AddObject", "classWorld.html#a9305e3c98df81e9f6989c344d4bc9c51", null ], [ "AddStaticMeshActor", "classWorld.html#a3aae64ec4571ac8870d606dc1b0bd9be", null ], + [ "CleanActors", "classWorld.html#a199a2fe00432f2b2ae958c6fdd66e2d1", null ], [ "CleanWorld", "classWorld.html#a68c87061bbbd6d702596d0c0a837a7ac", null ], [ "ConvertAActorToActor", "classWorld.html#a5236ae88205fb91bc623711bfdf7e54b", null ], [ "ConvertActorToAActor", "classWorld.html#a944244b32a2219826939859c6138f6ab", null ], diff --git a/classWorld_a0de989a6f75eb63748dfe33065ab7212_icgraph.svg b/classWorld_a0de989a6f75eb63748dfe33065ab7212_icgraph.svg index 804cb60a6..40dccefdf 100644 --- a/classWorld_a0de989a6f75eb63748dfe33065ab7212_icgraph.svg +++ b/classWorld_a0de989a6f75eb63748dfe33065ab7212_icgraph.svg @@ -49,7 +49,7 @@ + diff --git a/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_cgraph_org.svg b/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_cgraph_org.svg new file mode 100644 index 000000000..13580ab09 --- /dev/null +++ b/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_cgraph_org.svg @@ -0,0 +1,39 @@ + + + + + + +World::CleanActors + + +Node1 + + +World::CleanActors + + + + + +Node2 + + +World::Reset + + + + + +Node1->Node2 + + + + + + + + diff --git a/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_icgraph.map b/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_icgraph.map new file mode 100644 index 000000000..ad8f7c978 --- /dev/null +++ b/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_icgraph.map @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_icgraph.md5 b/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_icgraph.md5 new file mode 100644 index 000000000..4e65f2335 --- /dev/null +++ b/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_icgraph.md5 @@ -0,0 +1 @@ +cfc2ccb67150cb881e588248fb7cb0a4 \ No newline at end of file diff --git a/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_icgraph.svg b/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_icgraph.svg new file mode 100644 index 000000000..3d1a06e24 --- /dev/null +++ b/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_icgraph.svg @@ -0,0 +1,1187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +World::CleanActors + + +Node1 + + +World::CleanActors + + + + + +Node2 + + +CM_BeginPlay + + + + + +Node1->Node2 + + + + + + + + +Node3 + + +credits_spawn_actors + + + + + +Node2->Node3 + + + + + + + + +Node45 + + +init_actors_and_load +_textures + + + + + +Node2->Node45 + + + + + + + + +Node48 + + +setup_podium_ceremony + + + + + +Node2->Node48 + + + + + + + + +Node4 + + +load_credits + + + + + +Node3->Node4 + + + + + + + + +Node5 + + +update_gamestate + + + + + +Node4->Node5 + + + + + + + + +Node6 + + +thread5_iteration + + + + + +Node5->Node6 + + + + + + + + +Node7 + + +push_frame + + + + + +Node6->Node7 + + + + + + + + +Node8 + + +main + + + + + +Node7->Node8 + + + + + + + + +Node9 + + +reset_save_data_grand +_prix_points_and_sound_mode + + + + + +Node8->Node9 + + + + + + + + +Node15 + + +validate_save_data + + + + + +Node8->Node15 + + + + + + + + +Node22 + + +update_save_data_backup + + + + + +Node8->Node22 + + + + + + + + +Node44 + + +write_save_data_grand +_prix_points_and_sound_mode + + + + + +Node8->Node44 + + + + + + + + +Node10 + + +func_800B46D0 + + + + + +Node9->Node10 + + + + + + + + +Node14 + + +splash_menu_act + + + + + +Node9->Node14 + + + + + + + + +Node9->Node15 + + + + + + + + +Node11 + + +options_menu_act + + + + + +Node10->Node11 + + + + + + + + +Node12 + + +update_menus + + + + + +Node11->Node12 + + + + + + + + +Node13 + + +game_state_handler + + + + + +Node12->Node13 + + + + + + + + +Node13->Node6 + + + + + + + + +Node14->Node12 + + + + + + + + +Node16 + + +load_save_data + + + + + +Node15->Node16 + + + + + + + + +Node17 + + +func_80091B78 + + + + + +Node16->Node17 + + + + + + + + +Node18 + + +func_800025D4 + + + + + +Node17->Node18 + + + + + + + + +Node19 + + +func_80002600 + + + + + +Node17->Node19 + + + + + + + + +Node20 + + +func_8000262C + + + + + +Node17->Node20 + + + + + + + + +Node21 + + +func_80002658 + + + + + +Node17->Node21 + + + + + + + + +Node18->Node5 + + + + + + + + +Node19->Node5 + + + + + + + + +Node20->Node5 + + + + + + + + +Node21->Node5 + + + + + + + + +Node22->Node10 + + + + + + + + +Node22->Node11 + + + + + + + + +Node22->Node14 + + + + + + + + +Node22->Node15 + + + + + + + + +Node23 + + +func_800B536C + + + + + +Node22->Node23 + + + + + + + + +Node43 + + +func_800B5404 + + + + + +Node22->Node43 + + + + + + + + +Node24 + + +func_800AC458 + + + + + +Node23->Node24 + + + + + + + + +Node25 + + +handle_menus_with_pri_arg + + + + + +Node24->Node25 + + + + + + + + +Node26 + + +handle_menus_default + + + + + +Node25->Node26 + + + + + + + + +Node39 + + +handle_menus_special + + + + + +Node25->Node39 + + + + + + + + +Node27 + + +func_80093F10 + + + + + +Node26->Node27 + + + + + + + + +Node32 + + +func_800940EC + + + + + +Node26->Node32 + + + + + + + + +Node37 + + +func_80094A64 + + + + + +Node26->Node37 + + + + + + + + +Node38 + + +func_80095574 + + + + + +Node26->Node38 + + + + + + + + +Node28 + + +func_80280038 + + + + + +Node27->Node28 + + + + + + + + +Node30 + + +func_80281D00 + + + + + +Node27->Node30 + + + + + + + + +Node29 + + +credits_loop + + + + + +Node28->Node29 + + + + + + + + +Node29->Node13 + + + + + + + + +Node31 + + +podium_ceremony_loop + + + + + +Node30->Node31 + + + + + + + + +Node31->Node13 + + + + + + + + +Node33 + + +func_80093A5C + + + + + +Node32->Node33 + + + + + + + + +Node36 + + +func_80093B70 + + + + + +Node32->Node36 + + + + + + + + +Node34 + + +render_screens + + + + + +Node33->Node34 + + + + + + + + +Node35 + + +race_logic_loop + + + + + +Node34->Node35 + + + + + + + + +Node35->Node13 + + + + + + + + +Node37->Node13 + + + + + + + + +Node38->Node37 + + + + + + + + +Node40 + + +func_80093C98 + + + + + +Node39->Node40 + + + + + + + + +Node41 + + +func_80093E20 + + + + + +Node40->Node41 + + + + + + + + +Node42 + + +func_80093E40 + + + + + +Node40->Node42 + + + + + + + + +Node41->Node35 + + + + + + + + +Node42->Node37 + + + + + + + + +Node43->Node14 + + + + + + + + +Node44->Node9 + + + + + + + + +Node44->Node11 + + + + + + + + +Node44->Node14 + + + + + + + + +Node44->Node23 + + + + + + + + +Node44->Node43 + + + + + + + + +Node46 + + +setup_editor + + + + + +Node45->Node46 + + + + + + + + +Node47 + + +setup_race + + + + + +Node45->Node47 + + + + + + + + +Node47->Node5 + + + + + + + + +Node48->Node5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_icgraph_org.svg b/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_icgraph_org.svg new file mode 100644 index 000000000..02f1b79dd --- /dev/null +++ b/classWorld_a199a2fe00432f2b2ae958c6fdd66e2d1_icgraph_org.svg @@ -0,0 +1,1104 @@ + + + + + + +World::CleanActors + + +Node1 + + +World::CleanActors + + + + + +Node2 + + +CM_BeginPlay + + + + + +Node1->Node2 + + + + + + + + +Node3 + + +credits_spawn_actors + + + + + +Node2->Node3 + + + + + + + + +Node45 + + +init_actors_and_load +_textures + + + + + +Node2->Node45 + + + + + + + + +Node48 + + +setup_podium_ceremony + + + + + +Node2->Node48 + + + + + + + + +Node4 + + +load_credits + + + + + +Node3->Node4 + + + + + + + + +Node5 + + +update_gamestate + + + + + +Node4->Node5 + + + + + + + + +Node6 + + +thread5_iteration + + + + + +Node5->Node6 + + + + + + + + +Node7 + + +push_frame + + + + + +Node6->Node7 + + + + + + + + +Node8 + + +main + + + + + +Node7->Node8 + + + + + + + + +Node9 + + +reset_save_data_grand +_prix_points_and_sound_mode + + + + + +Node8->Node9 + + + + + + + + +Node15 + + +validate_save_data + + + + + +Node8->Node15 + + + + + + + + +Node22 + + +update_save_data_backup + + + + + +Node8->Node22 + + + + + + + + +Node44 + + +write_save_data_grand +_prix_points_and_sound_mode + + + + + +Node8->Node44 + + + + + + + + +Node10 + + +func_800B46D0 + + + + + +Node9->Node10 + + + + + + + + +Node14 + + +splash_menu_act + + + + + +Node9->Node14 + + + + + + + + +Node9->Node15 + + + + + + + + +Node11 + + +options_menu_act + + + + + +Node10->Node11 + + + + + + + + +Node12 + + +update_menus + + + + + +Node11->Node12 + + + + + + + + +Node13 + + +game_state_handler + + + + + +Node12->Node13 + + + + + + + + +Node13->Node6 + + + + + + + + +Node14->Node12 + + + + + + + + +Node16 + + +load_save_data + + + + + +Node15->Node16 + + + + + + + + +Node17 + + +func_80091B78 + + + + + +Node16->Node17 + + + + + + + + +Node18 + + +func_800025D4 + + + + + +Node17->Node18 + + + + + + + + +Node19 + + +func_80002600 + + + + + +Node17->Node19 + + + + + + + + +Node20 + + +func_8000262C + + + + + +Node17->Node20 + + + + + + + + +Node21 + + +func_80002658 + + + + + +Node17->Node21 + + + + + + + + +Node18->Node5 + + + + + + + + +Node19->Node5 + + + + + + + + +Node20->Node5 + + + + + + + + +Node21->Node5 + + + + + + + + +Node22->Node10 + + + + + + + + +Node22->Node11 + + + + + + + + +Node22->Node14 + + + + + + + + +Node22->Node15 + + + + + + + + +Node23 + + +func_800B536C + + + + + +Node22->Node23 + + + + + + + + +Node43 + + +func_800B5404 + + + + + +Node22->Node43 + + + + + + + + +Node24 + + +func_800AC458 + + + + + +Node23->Node24 + + + + + + + + +Node25 + + +handle_menus_with_pri_arg + + + + + +Node24->Node25 + + + + + + + + +Node26 + + +handle_menus_default + + + + + +Node25->Node26 + + + + + + + + +Node39 + + +handle_menus_special + + + + + +Node25->Node39 + + + + + + + + +Node27 + + +func_80093F10 + + + + + +Node26->Node27 + + + + + + + + +Node32 + + +func_800940EC + + + + + +Node26->Node32 + + + + + + + + +Node37 + + +func_80094A64 + + + + + +Node26->Node37 + + + + + + + + +Node38 + + +func_80095574 + + + + + +Node26->Node38 + + + + + + + + +Node28 + + +func_80280038 + + + + + +Node27->Node28 + + + + + + + + +Node30 + + +func_80281D00 + + + + + +Node27->Node30 + + + + + + + + +Node29 + + +credits_loop + + + + + +Node28->Node29 + + + + + + + + +Node29->Node13 + + + + + + + + +Node31 + + +podium_ceremony_loop + + + + + +Node30->Node31 + + + + + + + + +Node31->Node13 + + + + + + + + +Node33 + + +func_80093A5C + + + + + +Node32->Node33 + + + + + + + + +Node36 + + +func_80093B70 + + + + + +Node32->Node36 + + + + + + + + +Node34 + + +render_screens + + + + + +Node33->Node34 + + + + + + + + +Node35 + + +race_logic_loop + + + + + +Node34->Node35 + + + + + + + + +Node35->Node13 + + + + + + + + +Node37->Node13 + + + + + + + + +Node38->Node37 + + + + + + + + +Node40 + + +func_80093C98 + + + + + +Node39->Node40 + + + + + + + + +Node41 + + +func_80093E20 + + + + + +Node40->Node41 + + + + + + + + +Node42 + + +func_80093E40 + + + + + +Node40->Node42 + + + + + + + + +Node41->Node35 + + + + + + + + +Node42->Node37 + + + + + + + + +Node43->Node14 + + + + + + + + +Node44->Node9 + + + + + + + + +Node44->Node11 + + + + + + + + +Node44->Node14 + + + + + + + + +Node44->Node23 + + + + + + + + +Node44->Node43 + + + + + + + + +Node46 + + +setup_editor + + + + + +Node45->Node46 + + + + + + + + +Node47 + + +setup_race + + + + + +Node45->Node47 + + + + + + + + +Node47->Node5 + + + + + + + + +Node48->Node5 + + + + + + + + diff --git a/classWorld_a1a4dacc6aea0b846df998be0afc239f7_icgraph.svg b/classWorld_a1a4dacc6aea0b846df998be0afc239f7_icgraph.svg index 4c56a219e..e58e44aed 100644 --- a/classWorld_a1a4dacc6aea0b846df998be0afc239f7_icgraph.svg +++ b/classWorld_a1a4dacc6aea0b846df998be0afc239f7_icgraph.svg @@ -49,7 +49,7 @@