mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 12:52:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

canoe done (#2417)

Browse Source 
* d_a_canoe done

* fix debug
This commit is contained in:
TakaRikka
2025-05-03 00:33:31 -07:00
committed by GitHub
parent fb9fd4229a
commit 0369025df0
10 changed files with 969 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_L7demo_dr.cpp
+1 -1
View File
@@ -364,7 +364,7 @@ int daDr_c::create() {
if (dComIfG_play_c::getLayerNo(0) == 3) {
phase_state = dComIfG_resLoad(&mPhase, "B_dr");
if (phase_state == cPhs_COMPLEATE_e) {
OS_REPORT("dr PARAM %x\n", fopAcM_GetParam());
OS_REPORT("dr PARAM %x\n", fopAcM_GetParam(this));
OS_REPORT("dr//////////////DR SET 1 !!\n");
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x68C0)) {
src/d/actor/d_a_canoe.cpp
+890 -1111
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_zra.inc
+11 -8
View File
@@ -2236,15 +2236,18 @@ BOOL daNpc_zrA_c::swimGoalRiverDescend(void* param_0) {
if (player->current.pos.y < -14100.0f) {
if (!daNpcF_chkEvtBit(0x60)) {
mOrderEvtNo = EVT_THANKS_BLAST;
} else if (dMeter2Info_getNowCount() >= 30) {
dComIfGs_onSwitch(mSwitch1, fopAcM_GetRoomNo(this));
dComIfGs_onSwitch(mSwitch2, fopAcM_GetRoomNo(this));
mOrderEvtNo = EVT_THANKS_BLAST;
} else if (dMeter2Info_getNowCount() >= 25) {
dComIfGs_onSwitch(mSwitch1, fopAcM_GetRoomNo(this));
mOrderEvtNo = EVT_THANKS_BLAST;
} else {
mOrderEvtNo = EVT_RESULT_ANNOUNCE;
int count = dMeter2Info_getNowCount();
if (count >= 30) {
dComIfGs_onSwitch(mSwitch1, fopAcM_GetRoomNo(this));
dComIfGs_onSwitch(mSwitch2, fopAcM_GetRoomNo(this));
mOrderEvtNo = EVT_THANKS_BLAST;
} else if (count >= 25) {
dComIfGs_onSwitch(mSwitch1, fopAcM_GetRoomNo(this));
mOrderEvtNo = EVT_THANKS_BLAST;
} else {
mOrderEvtNo = EVT_RESULT_ANNOUNCE;
}
}
} else {
mPath.getDstPos(current.pos, pos);
src/d/d_msg_class.cpp
+1 -2
View File
@@ -1688,8 +1688,7 @@ bool jmessage_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_siz
dMsgUnit_setTag(0x10001, (u32)dComIfGp_getMessageCountNumber(), buffer_0);
break;
case 7:
u8 now_count = dMeter2Info_getNowCount();
dMsgUnit_setTag(8, now_count, buffer_0);
dMsgUnit_setTag(8, dMeter2Info_getNowCount(), buffer_0);
break;
default:
return false;
src/f_op/f_op_actor_mng.cpp
+8 -8
View File
@@ -2023,16 +2023,16 @@ void fpoAcM_relativePos(fopAc_ac_c const* i_actor, cXyz const* i_pos, cXyz* o_po
/* 8001D9A8-8001DAE4 0182E8 013C+00 0/0 1/1 9/9 .text
* fopAcM_getWaterStream__FPC4cXyzRC13cBgS_PolyInfoP4cXyzPii */
s32 fopAcM_getWaterStream(cXyz const* param_0, cBgS_PolyInfo const& param_1, cXyz* speed,
int* param_3, int param_4) {
s32 fopAcM_getWaterStream(cXyz const* pos, cBgS_PolyInfo const& polyinfo, cXyz* speed,
int* power, BOOL param_4) {
daTagStream_c* stream = daTagStream_c::getTop();
if (stream != NULL) {
for (stream = daTagStream_c::getTop(); stream != NULL; stream = stream->getNext()) {
if (stream->checkStreamOn() && (param_4 == 0 || stream->checkCanoeOn()) &&
stream->checkArea(param_0))
if (stream->checkStreamOn() && (!param_4 || stream->checkCanoeOn()) &&
stream->checkArea(pos))
{
*speed = stream->speed;
*param_3 = stream->getPower() & 0xff;
*power = stream->getPower() & 0xff;
return 1;
}
}
@@ -2042,14 +2042,14 @@ s32 fopAcM_getWaterStream(cXyz const* param_0, cBgS_PolyInfo const& param_1, cXy
return 0;
}
if (dComIfG_Bgsp().ChkPolySafe(param_1)) {
if (dPath_GetPolyRoomPathVec(param_1, speed, param_3)) {
if (dComIfG_Bgsp().ChkPolySafe(polyinfo)) {
if (dPath_GetPolyRoomPathVec(polyinfo, speed, power)) {
speed->normalizeZP();
return 1;
}
} else {
*speed = cXyz::Zero;
*param_3 = 0;
*power = 0;
}
return 0;