mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-11 04:03:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

inlines

Browse Source
This commit is contained in:
LagoLunatic
2026-09-05 19:11:35 -04:00
parent b8d302776d
commit f7d64187ed
52 changed files with 134 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_hr.cpp
+4 -4
View File
@@ -1171,8 +1171,8 @@ void daNpc_Hr_c::eventOrder() {
/* 00002C94-00002D3C .text checkOrder__10daNpc_Hr_cFv */
void daNpc_Hr_c::checkOrder() {
if (eventInfo.mCommand != dEvtCmd_INDEMO_e) {
if (eventInfo.mCommand == dEvtCmd_INTALK_e && ChkOrder(7)) {
if (!eventInfo.checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandTalk() && ChkOrder(7)) {
if (dComIfGp_event_chkTalkXY()) {
setFlag(HR_FLAG_00000008);
} else {
@@ -1549,7 +1549,7 @@ bool daNpc_Hr_c::rt_hide() {
getTornadoPos(0, &tornadoPos);
current.pos = tornadoPos;
current.pos.y -= 1500.0f;
if(eventInfo.mCommand == dEvtCmd_INDEMO_e) {
if(eventInfo.checkCommandDemoAccrpt()) {
mReturnState = 8;
mState = HR_STATE_RT_INTRO;
mStaffIdx = dComIfGp_evmng_getMyStaffId("Hr2");
@@ -1677,7 +1677,7 @@ bool daNpc_Hr_c::rt_win() {
bool daNpc_Hr_c::rt_hit0() {
daShip_c* pShip = dComIfGp_getShipActor();
if(eventInfo.mCommand == dEvtCmd_INDEMO_e) {
if(eventInfo.checkCommandDemoAccrpt()) {
mState = HR_STATE_RT_HIT_1;
mStaffIdx = dComIfGp_evmng_getMyStaffId("Hr2");
setEvFlag(EVFLAG_TORNADO_ACTIVE);