mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-02 04:25:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

b_gnd equivalent (#2340)

Browse Source 
* b_gnd equivalent

* fix dEvt_info_c inlines

* fix some more inlines
This commit is contained in:
TakaRikka
2025-03-23 12:55:28 -07:00
committed by GitHub
parent 4dc0cd9d09
commit a4cdad86f4
178 changed files with 4611 additions and 5262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_kgate.cpp
+6 -6
View File
@@ -440,7 +440,7 @@ int daObjKGate_c::checkAreaL(cXyz const* param_0, cXyz const* param_1) {
pos = player_p->current.pos;
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
offset.set(0.0f, 0.0f, 90.0f);
} else {
offset.set(0.0f, 0.0f, 0.0f);
@@ -526,7 +526,7 @@ int daObjKGate_c::checkAreaR(cXyz const* param_0, cXyz const* param_1) {
pos = player_p->current.pos;
cXyz player_offset;
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
player_offset.set(0.0f, 0.0f, 90.0f);
} else {
player_offset.set(0.0f, 0.0f, 0.0f);
@@ -782,7 +782,7 @@ void daObjKGate_c::action_typeA() {
if (chk_l != 0 || chk_r != 0) {
daPy_py_c* player_p = daPy_getPlayerActorClass();
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
if (player_p->checkWolfAttackReverse() || player_p->checkFrontRollCrash()) {
field_0xb98 = 1200.0f;
field_0xb94 = 1200.0f;
@@ -832,7 +832,7 @@ void daObjKGate_c::action_typeB() {
if (chk_l != 0 || chk_r != 0) {
daPy_py_c* player_p = daPy_getPlayerActorClass();
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
if (player_p->checkWolfAttackReverse() || player_p->checkFrontRollCrash()) {
field_0xb98 = 1200.0f;
field_0xb94 = 1200.0f;
@@ -878,7 +878,7 @@ void daObjKGate_c::action_typeB() {
/* 8058A1B0-8058A294 0021B0 00E4+00 1/0 0/0 0/0 .text actionWaitEvent__12daObjKGate_cFv
*/
void daObjKGate_c::actionWaitEvent() {
if (eventInfo.i_checkCommandDoor()) {
if (eventInfo.checkCommandDoor()) {
setAction(ACT_EVENT);
dComIfGp_setItemKeyNumCount(-1);
fopAcM_onSwitch(this, getSwNo());
@@ -886,7 +886,7 @@ void daObjKGate_c::actionWaitEvent() {
} else if (checkOpen()) {
eventInfo.setEventId(mEventID);
eventInfo.setMapToolId(mMapToolID);
eventInfo.i_onCondition(dEvtCnd_CANDOOR_e);
eventInfo.onCondition(dEvtCnd_CANDOOR_e);
}
}