mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-25 10:52:19 -05:00
Code Issues Projects Releases Wiki Activity

Remove debug elements and visual SoA (#3086)

Browse Source
This commit is contained in:
aMannus 2023-08-20 19:59:39 +02:00 committed by GitHub
parent f19f303651
commit b040a894d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/src/code/z_debug.c
View File

@ -1,4 +1,5 @@
#include "global.h" #include "global.h"
#include "soh/Enhancements/game-interactor/GameInteractor.h"
typedef struct { typedef struct {
u8 x; u8 x;
@ -219,8 +220,9 @@ void func_80063D7C(GraphicsContext* gfxCtx) {
GfxPrint printer; GfxPrint printer;
Gfx* tempRet; Gfx* tempRet;
if (!CVarGetInteger("gDebugEnabled", 0)) if (!CVarGetInteger("gDebugEnabled", 0) || GameInteractor_NoUIActive()) {
return; return;
}
OPEN_DISPS(gfxCtx); OPEN_DISPS(gfxCtx);

5
soh/src/code/z_debug_display.c
View File

@ -1,5 +1,6 @@
#include "global.h" #include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h" #include "objects/gameplay_keep/gameplay_keep.h"
#include "soh/Enhancements/game-interactor/GameInteractor.h"
typedef struct { typedef struct {
/* 0x00 */ s16 drawType; // indicates which draw function to use when displaying the object /* 0x00 */ s16 drawType; // indicates which draw function to use when displaying the object
@ -34,6 +35,10 @@ DebugDispObject* DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX,
GraphicsContext* gfxCtx) { GraphicsContext* gfxCtx) {
DebugDispObject* prevHead = sDebugObjectListHead; DebugDispObject* prevHead = sDebugObjectListHead;
if (GameInteractor_NoUIActive()) {
return sDebugObjectListHead;
}
sDebugObjectListHead = Graph_Alloc(gfxCtx, sizeof(DebugDispObject)); sDebugObjectListHead = Graph_Alloc(gfxCtx, sizeof(DebugDispObject));
sDebugObjectListHead->pos.x = posX; sDebugObjectListHead->pos.x = posX;

4
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -10490,7 +10490,7 @@ void func_80848EF8(Player* this, PlayState* play) {
if (CVarGetInteger("gCosmetics.Hud_StoneOfAgony.Changed", 0)) { if (CVarGetInteger("gCosmetics.Hud_StoneOfAgony.Changed", 0)) {
stoneOfAgonyColor = CVarGetColor24("gCosmetics.Hud_StoneOfAgony.Value", stoneOfAgonyColor); stoneOfAgonyColor = CVarGetColor24("gCosmetics.Hud_StoneOfAgony.Value", stoneOfAgonyColor);
} }
if (CVarGetInteger("gVisualAgony", 0) != 0 && !this->stateFlags1) { if (CVarGetInteger("gVisualAgony", 0) && !this->stateFlags1 && !GameInteractor_NoUIActive()) {
s16 Top_Margins = (CVarGetInteger("gHUDMargin_T", 0) * -1); s16 Top_Margins = (CVarGetInteger("gHUDMargin_T", 0) * -1);
s16 Left_Margins = CVarGetInteger("gHUDMargin_L", 0); s16 Left_Margins = CVarGetInteger("gHUDMargin_L", 0);
s16 Right_Margins = CVarGetInteger("gHUDMargin_R", 0); s16 Right_Margins = CVarGetInteger("gHUDMargin_R", 0);
@ -10574,7 +10574,7 @@ void func_80848EF8(Player* this, PlayState* play) {
if (this->unk_6A0 > 4000000.0f) { if (this->unk_6A0 > 4000000.0f) {
this->unk_6A0 = 0.0f; this->unk_6A0 = 0.0f;
if (CVarGetInteger("gVisualAgony", 0) != 0 && !this->stateFlags1) { if (CVarGetInteger("gVisualAgony", 0) && !this->stateFlags1 && !GameInteractor_NoUIActive()) {
// This audio is placed here and not in previous CVar check to prevent ears ra.. :) // This audio is placed here and not in previous CVar check to prevent ears ra.. :)
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E0); Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E0);
} }