mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-22 16:18:50 -05:00
Code Issues Projects Releases Wiki Activity

use same Cvar than 3D drops item

Browse Source
This commit is contained in:
Baoulettes 2022-05-25 20:20:44 +02:00
parent 5fd0100ad0
commit fb270dbab9
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libultraship/libultraship/SohImGuiImpl.cpp
View File

@ -734,9 +734,8 @@ namespace SohImGui {
EnhancementCheckbox("N64 Mode", "gN64Mode"); EnhancementCheckbox("N64 Mode", "gN64Mode");
Tooltip("Sets aspect ratio to 4:3 and lowers resolution to 240p, the N64's native resolution"); Tooltip("Sets aspect ratio to 4:3 and lowers resolution to 240p, the N64's native resolution");
EnhancementCheckbox("Animated Link in Pause Menu", "gPauseLiveLink"); EnhancementCheckbox("Animated Link in Pause Menu", "gPauseLiveLink");
EnhancementCheckbox("Enable 3D Dropped items", "gNewDrops"); EnhancementCheckbox("Enable 3D Dropped items/projectiles", "gNewDrops");
EnhancementCheckbox("Enable 3D projectiles", "gNewProjectiles"); Tooltip("Change most 2D items & projectiles to their a 3D version");
Tooltip("Change some of monsters projectiles to their a 3D version");
EnhancementCheckbox("Dynamic Wallet Icon", "gDynamicWalletIcon"); EnhancementCheckbox("Dynamic Wallet Icon", "gDynamicWalletIcon");
Tooltip("Changes the rupee in the wallet icon to match the wallet size you currently have"); Tooltip("Changes the rupee in the wallet icon to match the wallet size you currently have");
EnhancementCheckbox("Always show dungeon entrances", "gAlwaysShowDungeonMinimapIcon"); EnhancementCheckbox("Always show dungeon entrances", "gAlwaysShowDungeonMinimapIcon");

4
soh/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
View File

@ -127,7 +127,7 @@ void func_80ABBBA8(EnNutsball* this, GlobalContext* globalCtx) {
this->collider.info.toucher.dmgFlags = 2; this->collider.info.toucher.dmgFlags = 2;
Matrix_MtxFToYXZRotS(&player->shieldMf, &sp4C, 0); Matrix_MtxFToYXZRotS(&player->shieldMf, &sp4C, 0);
if (CVar_GetS32("gNewProjectiles", 0) != 0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
this->actor.world.rot.z = sp4C.y + 0x8000; this->actor.world.rot.z = sp4C.y + 0x8000;
} else { } else {
this->actor.world.rot.y = sp4C.y + 0x8000; this->actor.world.rot.y = sp4C.y + 0x8000;
@ -176,7 +176,7 @@ void EnNutsball_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_nutsball.c", 327); OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_nutsball.c", 327);
if (CVar_GetS32("gNewProjectiles", 0) != 0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, gSPSegment(POLY_OPA_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 6), Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 6),

2
soh/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
View File

@ -714,7 +714,7 @@ void EnOkuta_Draw(Actor* thisx, GlobalContext* globalCtx) {
} else { } else {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_okuta.c", 1653); OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_okuta.c", 1653);
if (CVar_GetS32("gNewProjectiles", 0) != 0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, gSPSegment(POLY_OPA_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 6), Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 6),