summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_talk.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-12-24 19:57:36 -0500
committerGitHub <noreply@github.com>2025-12-24 16:57:36 -0800
commit229527daf71c76965ef0735abca530cee68b7358 (patch)
tree0325055c01866d359b1556a2cbc6b65cbd238466 /src/d/actor/d_a_talk.cpp
parentcefe919b8d39cb5b60d79b1dc7452e80abdf9657 (diff)
Resolve all gameInfo fakematches (#2995)
* Clean up various inlines/fakematches/comments * Copy OptRuby inline name from TWW debug * Resolve all dEvt_control_c related fakematches, return pointer instead of reference * Fix some more missing inline usages
Diffstat (limited to 'src/d/actor/d_a_talk.cpp')
-rw-r--r--src/d/actor/d_a_talk.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/d/actor/d_a_talk.cpp b/src/d/actor/d_a_talk.cpp
index 071f53ba74..b77a7069eb 100644
--- a/src/d/actor/d_a_talk.cpp
+++ b/src/d/actor/d_a_talk.cpp
@@ -26,8 +26,7 @@ int daTalk_c::create() {
}
int daTalk_c::execute() {
- dComIfG_inf_c& dcomif = g_dComIfG_gameInfo;
- if (dcomif.play.getEvent().runCheck()) {
+ if (dComIfGp_event_runCheck()) {
if (!eventInfo.checkCommandTalk()) {
fopAcM_delete(this);
}
@@ -49,7 +48,7 @@ int daTalk_c::execute() {
} else if (getStatus() == 14) {
setStatus(16);
} else if (getStatus() == 18) {
- dcomif.play.getEvent().reset();
+ dComIfGp_event_reset();
setStatus(19);
mMessageID = -1;
fopAcM_delete(this);
@@ -58,7 +57,7 @@ int daTalk_c::execute() {
mMsgFlow.init(this, dMsgObject_getMsgObjectClass()->getNodeIdx(), 0, NULL);
mMessageID = 2;
} else if (mMsgFlow.doFlow(dMsgObject_getMsgObjectClass()->getpTalkActor(), NULL, 0)) {
- dcomif.play.getEvent().reset();
+ dComIfGp_event_reset();
mMessageID = -1;
fopAcM_delete(this);
}