github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-07-31 03:50:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert GameInteractor_Should hook to use variadic arguments (#4383)

Browse source 
* Convert _Should to use variadic args

* Convert everything to use va_arg properly

* Update shop hooks to va_args

* Wrong Function

* Update hook_handlers.cpp

---------

Co-authored-by: Malkierian <malkierian@gmail.com>
Co-authored-by: Malkierian <malkierian@live.com>
This commit is contained in:
Archez 2024-10-08 23:20:09 -04:00 • committed by GitHub
parent 9df3c41d8a
commit 5d311fac9f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
63 changed files with 308 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

6
soh/src/code/z_parameter.c
View file

@ -5372,7 +5372,7 @@ void Interface_Draw(PlayState* play) {
if (fullUi) {
s16 PosX_RC;
s16 PosY_RC;
if (GameInteractor_Should(VB_RENDER_RUPEE_COUNTER, true, NULL)) {
if (GameInteractor_Should(VB_RENDER_RUPEE_COUNTER, true)) {
// Rupee Icon
if (CVarGetInteger(CVAR_ENHANCEMENT("DynamicWalletIcon"), 0)) {
switch (CUR_UPG_VALUE(UPG_WALLET)) {
@ -5446,7 +5446,7 @@ void Interface_Draw(PlayState* play) {
OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gRupeeCounterIconTex, 16, 16, PosX_RC, PosY_RC, 16, 16, 1 << 10, 1 << 10);
}
if (GameInteractor_Should(VB_RENDER_KEY_COUNTER, true, NULL)) {
if (GameInteractor_Should(VB_RENDER_KEY_COUNTER, true)) {
switch (play->sceneNum) {
case SCENE_FOREST_TEMPLE:
case SCENE_FIRE_TEMPLE:
@ -5527,7 +5527,7 @@ void Interface_Draw(PlayState* play) {
}
}
if (GameInteractor_Should(VB_RENDER_RUPEE_COUNTER, true, NULL)) {
if (GameInteractor_Should(VB_RENDER_RUPEE_COUNTER, true)) {
// Rupee Counter
gDPPipeSync(OVERLAY_DISP++);