Game-Decompilation/CTR-ModSDK
1
0
Fork 0
mirror of https://github.com/CTR-tools/CTR-ModSDK.git synced 2024-11-30 08:50:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
Niko 2024-07-07 21:53:09 -04:00
parent 0ca73be545
commit fe648ae247
3 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
decompile/General/MAIN/MainFrame_RenderFrame.c
View File

@ -1482,6 +1482,22 @@ void MultiplayerWumpaHUD(struct GameTracker* gGT)
if((gGT->hudFlags & 1) == 0) return;
if(gGT->numPlyrCurrGame < 2) return;
for(int i = 0; i < gGT->numPlyrCurrGame; i++)
{
struct Driver* d = gGT->drivers[i];
// if race is over for driver
if((d->actionsFlagSet & 0x2000000) != 0)
{
struct Instance* instFruitDisp =
d->instFruitDisp;
instFruitDisp->scale[0] = 0;
instFruitDisp->scale[1] = 0;
instFruitDisp->scale[2] = 0;
}
}
#ifndef REBUILD_PS1
UI_RenderFrame_Wumpa3D_2P3P4P(gGT);
#endif

28
decompile/General/PlayLevel_UpdateLapStats.c
View File

@ -188,20 +188,6 @@ void DECOMP_PlayLevel_UpdateLapStats(void)
// this one racer has now finished the race
currDriver->actionsFlagSet |= 0x2000000;
// required cause we use 3D wumpa
// in multiplayer instead of 2D
#if 1
if(currDriver->driverID < gGT->numPlyrCurrGame)
{
struct Instance* instFruitDisp =
gGT->drivers[currDriver->driverID]->instFruitDisp;
instFruitDisp->scale[0] = 0;
instFruitDisp->scale[1] = 0;
instFruitDisp->scale[2] = 0;
}
#endif
// === Run on first frame that race ends ===
// if total event hasn't finished (gGT->gameMode1)
@ -527,20 +513,6 @@ void DECOMP_PlayLevel_UpdateLapStats(void)
// End the race for this player
currDriver->actionsFlagSet |= 0x2000000;
// required cause we use 3D wumpa
// in multiplayer instead of 2D
#if 1
if(currRank < gGT->numPlyrCurrGame)
{
struct Instance* instFruitDisp =
gGT->drivers[currRank]->instFruitDisp;
instFruitDisp->scale[0] = 0;
instFruitDisp->scale[1] = 0;
instFruitDisp->scale[2] = 0;
}
#endif
// remove weapon
currDriver->heldItemID = 0xf;

2
include/common.h
View File

@ -16,7 +16,7 @@
//#define USE_BIGQUEUE // Requires RAMEX: Extended loading queue
//#define USE_HIGH1P // Requires BIGQUEUE: All high model drivers
//#define USE_RANDOM // Requires HIGH1P: Character Randomizer
#define USE_ONLINE // Requires HIGH1P: Online Multiplayer
//#define USE_ONLINE // Requires HIGH1P: Online Multiplayer
//#define USE_HIGHMP // Requires RAMEX: Multiplayer Maxed mod
//#define USE_VR // Virtual Reality