mirror
/
SpaghettiKart
mirror of https://github.com/HarbourMasters/SpaghettiKart
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'trackref' of https://github.com/megamech/SpaghettiKart into trackref

This commit is contained in:
MegaMech 2025-12-13 10:54:03 -07:00
parent 9c052f91fc ffa4d090fe
commit a903e3aba5
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/engine/tracks/Track.cpp
View File

@ -82,6 +82,21 @@ static void SwapTriangleVertices(Gfx* cmd) {
}
}
// Remove all occurrences of the marker "__OTR__" from a name string.
static std::string StripOtrPrefix(const char* s) {
if (s == nullptr) {
return std::string();
}
std::string out(s);
const std::string marker = "__OTR__";
size_t pos = 0;
while ((pos = out.find(marker, pos)) != std::string::npos) {
out.erase(pos, marker.length());
}
return out;
}
static void InvertTriangleWindingInternal(Gfx* gfx, const char* gfxName, bool shouldSwap) {
if (gfx == nullptr) {
return;
@ -92,7 +107,7 @@ static void InvertTriangleWindingInternal(Gfx* gfx, const char* gfxName, bool sh
}
if (gfxName != nullptr) {
std::string nameStr(gfxName);
std::string nameStr = StripOtrPrefix(gfxName);
if (gModifiedGfxSet.find(nameStr) != gModifiedGfxSet.end()) {
return;
}
@ -150,7 +165,7 @@ static void InvertTriangleWindingInternal(Gfx* gfx, const char* gfxName, bool sh
uint64_t hash = ((uint64_t)cmd->words.w0 << 32) | cmd->words.w1;
const char* name = ResourceGetNameByCrc(hash);
if (name != nullptr && gfxName == nullptr) {
std::string nameStr(name);
std::string nameStr = StripOtrPrefix(name);
if (gModifiedGfxSet.find(nameStr) != gModifiedGfxSet.end()) {
return;
}

1
src/port/Game.cpp
View File

@ -143,6 +143,7 @@ void CustomEngineInit() {
void CustomEngineDestroy() {
gTrackRegistry.Clear();
gActorRegistry.Clear();
gPodiumCeremony = nullptr;
delete gMushroomCup;
delete gFlowerCup;
delete gStarCup;