mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-18 13:13:29 -04:00
Use dComIfGp_event_runCheck instead of dComIfGp_event_getMode, remove some fakematches
This commit is contained in:
@@ -1848,9 +1848,7 @@ bool daNpcRoten_c::_execute() {
|
||||
chkAttention();
|
||||
checkOrder();
|
||||
|
||||
dBgS* bgs = dComIfG_Bgsp(); // fakematch?
|
||||
|
||||
if(dComIfGp_event_getMode() == dEvtMode_NONE_e || (eventInfo.checkCommandTalk() && (field_0x9B2 & 0x8000) == 0)) {
|
||||
if(!dComIfGp_event_runCheck() || (eventInfo.checkCommandTalk() && (field_0x9B2 & 0x8000) == 0)) {
|
||||
(this->*moveProc[field_0x9BB])();
|
||||
}
|
||||
else {
|
||||
@@ -1863,7 +1861,7 @@ bool daNpcRoten_c::_execute() {
|
||||
|
||||
speedF = field_0x990;
|
||||
fopAcM_posMoveF(this, mStts.GetCCMoveP());
|
||||
mObjAcch.CrrPos(*bgs);
|
||||
mObjAcch.CrrPos(*dComIfG_Bgsp());
|
||||
setCollision(l_npc_dat[mNpcNo].field_0x2C, 200.0f);
|
||||
setCollisionH();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user