mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-09-07 19:50:50 -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/player_controller.c
+4 -4
View File
@@ -249,7 +249,7 @@ void func_80027EDC(Player* player, s8 playerId) {
if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) &&
((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) {
CourseManager_WhatDoesThisDo(player, playerId);
CM_WhatDoesThisDo(player, playerId);
// switch (gCurrentCourseId) {
// // case COURSE_MARIO_RACEWAY:
@@ -383,7 +383,7 @@ void func_80027EDC(Player* player, s8 playerId) {
// }
} else {
CourseManager_WhatDoesThisDoAI(player, playerId);
CM_WhatDoesThisDoAI(player, playerId);
// switch (gCurrentCourseId) {
// case COURSE_MARIO_RACEWAY:
@@ -585,7 +585,7 @@ void func_80028C44(Player* player, Camera* camera, s8 playerId, s8 screenId) {
}
void func_80028D3C(Player* player, Camera* camera, s8 playerId, s8 screenId) {
if ((((player->type & PLAYER_START_SEQUENCE) == 0) && (D_800DC510 != 5)) || (player->unk_0CA & 2) != 0 ||
if ((((player->type & PLAYER_START_SEQUENCE) == 0) && (gRaceState != RACE_FINISHED)) || (player->unk_0CA & 2) != 0 ||
(player->unk_0CA & 8) != 0 || (player->effects & 0x4F010CC0) != 0) {
player->effects &= ~0x1000;
@@ -1974,7 +1974,7 @@ void apply_effect(Player* player, s8 arg1, s8 arg2) {
func_8008D8B4(player, arg1);
decelerate_ai_player(player, 10.0f);
}
if (D_800DC510 != 5) {
if (gRaceState != RACE_FINISHED) {
if (player->soundEffects & 0x04000000) {
func_8008FC64(player, arg1);
}