mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-08 06:30:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_wsword work (#1911)

Browse Source
This commit is contained in:
Trueffel
2023-09-05 12:27:09 +02:00
committed by GitHub
parent 7f762353ea
commit efa1d31522
18 changed files with 109 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink.cpp
+1 -4
View File
@@ -25,16 +25,13 @@
#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h"
#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h"
#include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h"
#include "rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.h"
#include "rel/d/a/d_a_mirror/d_a_mirror.h"
//
// Types:
//
struct daTagMist_c {
/* 80031CF0 */ void getPlayerNo();
};
struct daObj_Sekizoa_c {
/* 801312C8 */ void setWolfHowling();
};
src/d/menu/d_menu_fishing.cpp
+4 -16
View File
@@ -259,18 +259,12 @@ int dMenu_Fishing_c::_open() {
if (field_0x1f8 >= openFrames) {
field_0x1f8 = closeFrames;
mStatus = 2;
J2DPane* pane = mpParent->getPanePtr();
pane->mScaleX = 1.0f;
pane->mScaleY = 1.0f;
pane->calcMtx();
mpParent->scale(1.0f, 1.0f);
mpParent->setAlphaRate(1.0f);
return 1;
} else {
f32 div = field_0x1f8 / (f32)openFrames;
J2DPane* pane = mpParent->getPanePtr();
pane->mScaleX = div;
pane->mScaleY = div;
pane->calcMtx();
mpParent->scale(div, div);
mpParent->setAlphaRate(div);
return 0;
}
@@ -283,18 +277,12 @@ int dMenu_Fishing_c::_close() {
if (field_0x1f8 <= 0) {
field_0x1f8 = 0;
mStatus = 0;
J2DPane* pane = mpParent->getPanePtr();
pane->mScaleX = 0.0f;
pane->mScaleY = 0.0f;
pane->calcMtx();
mpParent->scale(0.0f, 0.0f);
mpParent->setAlphaRate(0.0f);
return 1;
} else {
f32 div = field_0x1f8 / (f32)closeFrames;
J2DPane* pane = mpParent->getPanePtr();
pane->mScaleX = div;
pane->mScaleY = div;
pane->calcMtx();
mpParent->scale(div, div);
mpParent->setAlphaRate(div);
return 0;
}
src/d/menu/d_menu_insect.cpp
+4 -16
View File
@@ -428,10 +428,7 @@ int dMenu_Insect_c::_open() {
if (field_0xf0 >= openFrame) {
field_0xf0 = closeFrame;
mStatus = 2;
J2DPane* pane = mpParent->getPanePtr();
pane->mScaleX = 1.0f;
pane->mScaleY = 1.0f;
pane->calcMtx();
mpParent->scale(1.0f, 1.0f);
mpParent->setAlphaRate(1.0f);
setCursorPos();
mpDrawCursor->setAlphaRate(1.0f);
@@ -440,10 +437,7 @@ int dMenu_Insect_c::_open() {
return 1;
} else {
f32 div = (f32)field_0xf0 / (f32)openFrame;
J2DPane* pane = mpParent->getPanePtr();
pane->mScaleX = div;
pane->mScaleY = div;
pane->calcMtx();
mpParent->scale(div, div);
mpParent->setAlphaRate(div);
setCursorPos();
mpDrawCursor->setAlphaRate(div);
@@ -471,10 +465,7 @@ int dMenu_Insect_c::_close() {
if (field_0xf0 <= 0) {
field_0xf0 = 0;
mStatus = 0;
J2DPane* pane = mpParent->getPanePtr();
pane->mScaleX = 0.0f;
pane->mScaleY = 0.0f;
pane->calcMtx();
mpParent->scale(0.0f, 0.0f);
mpParent->setAlphaRate(0.0f);
setCursorPos();
mpDrawCursor->setAlphaRate(0.0f);
@@ -482,10 +473,7 @@ int dMenu_Insect_c::_close() {
return 1;
} else {
f32 div = (f32)field_0xf0 / (f32)closeFrame;
J2DPane* pane = mpParent->getPanePtr();
pane->mScaleX = div;
pane->mScaleY = div;
pane->calcMtx();
mpParent->scale(div, div);
mpParent->setAlphaRate(div);
setCursorPos();
mpDrawCursor->setAlphaRate(div);
src/d/menu/d_menu_skill.cpp
+4 -16
View File
@@ -248,10 +248,7 @@ int dMenu_Skill_c::_open() {
if (mFrame >= openFrame) {
mFrame = closeFrame;
mStatus = 2;
J2DPane* pane = mpParent->getPanePtr();
pane->mScaleX = 1.0f;
pane->mScaleY = 1.0f;
pane->calcMtx();
mpParent->scale(1.0f, 1.0f);
mpParent->setAlphaRate(1.0f);
setCursorPos();
mpDrawCursor->setAlphaRate(1.0f);
@@ -260,10 +257,7 @@ int dMenu_Skill_c::_open() {
return 1;
} else {
f32 div = (f32)mFrame / (f32)openFrame;
J2DPane* pane = mpParent->getPanePtr();
pane->mScaleX = div;
pane->mScaleY = div;
pane->calcMtx();
mpParent->scale(div, div);
mpParent->setAlphaRate(div);
setCursorPos();
mpDrawCursor->setAlphaRate(div);
@@ -279,10 +273,7 @@ int dMenu_Skill_c::_close() {
if (mFrame <= 0) {
mFrame = 0;
mStatus = 0;
J2DPane* pane = mpParent->getPanePtr();
pane->mScaleX = 0.0f;
pane->mScaleY = 0.0f;
pane->calcMtx();
mpParent->scale(0.0f, 0.0f);
mpParent->setAlphaRate(0.0f);
setCursorPos();
mpDrawCursor->setAlphaRate(0.0f);
@@ -290,10 +281,7 @@ int dMenu_Skill_c::_close() {
return 1;
} else {
f32 div = (f32)mFrame / (f32)closeFrame;
J2DPane* pane = mpParent->getPanePtr();
pane->mScaleX = div;
pane->mScaleY = div;
pane->calcMtx();
mpParent->scale(div, div);
mpParent->setAlphaRate(div);
setCursorPos();
mpDrawCursor->setAlphaRate(div);