mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-06-21 08:41:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Game.cpp and World.cpp Cleanup (#159)

Browse Source 
* Remove CProperties and delete dup Properties from World.h

* Improvement

* Fix compile

* Cleanup

* Document gRaceState

* wip cleanup

* compile

* Impl PlayerBombKart

* Rename CourseManager_ to CM_

* Finish renames m_ to CM_

* cleanup

* Remove extra printf

---------

Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
This commit is contained in:
MegaMech
2025-01-23 11:22:07 -07:00
committed by GitHub
parent 24ecfc3db4
commit 1f189dfa80
115 changed files with 1000 additions and 1306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/vehicles/Car.cpp
+8 -10
View File
@@ -57,17 +57,15 @@ ACar::ACar(f32 speedA, f32 speedB, TrackWaypoint* path, uint32_t waypoint) {
}
D_801631C8 = 10;
_count++;
}
void ACar::Spawn() {
spawn_vehicle_on_road(Position, Rotation, Velocity, WaypointIndex, SomeMultiplierTheSequel,
Speed);
ActorIndex = add_actor_to_empty_slot(Position, Rotation, Velocity, ACTOR_CAR);
_count++;
}
void ACar::BeginPlay() {
bool ACar::IsMod() {
return true;
}
void ACar::Tick() {
@@ -135,25 +133,25 @@ void ACar::Tick() {
vehicleActor->velocity[2] = Velocity[2];
}
void ACar::Draw(s32 playerId) {
void ACar::Draw(Camera* camera) {
s32 var_v0;
s32 var_s2;
s32 waypointCount;
u16 temp_a1;
waypointCount = gWaypointCountByPathIndex[0];
if (!(gPlayers[playerId].unk_094 < 1.6666666666666667)) {
if (!(gPlayers[camera->playerId].unk_094 < 1.6666666666666667)) {
temp_a1 = WaypointIndex;
for (var_v0 = 0; var_v0 < 0x18; var_v0 += 3) {
if (((sSomeNearestWaypoint + var_v0) % waypointCount) == temp_a1) {
D_801634F8[playerId].unk4 = func_800145A8(SomeType, D_80163068[playerId], temp_a1);
D_801634F8[camera->playerId].unk4 = func_800145A8(SomeType, D_80163068[camera->playerId], temp_a1);
return;
}
}
}
}
void ACar::Collision(s32 playerId, Player* player) {
void ACar::VehicleCollision(s32 playerId, Player* player) {
f32 temp_f12;
f32 temp_f14;
f32 temp_f22;