Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-06 19:01:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use CurrentThink() to get the current think

Browse source
This commit is contained in:
smallmodel 2023-10-28 00:01:57 +02:00
parent 43bb5ce653
commit 0906124867
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
code/fgame/actor.cpp
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2023 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -7771,6 +7771,7 @@ void Actor::InitThinkStates(void)
for (size_t i = 0; i < NUM_THINKSTATES; i++) { for (size_t i = 0; i < NUM_THINKSTATES; i++) {
m_ThinkMap[i] = THINK_VOID; m_ThinkMap[i] = THINK_VOID;
} }
for (size_t i = 0; i < NUM_THINKLEVELS; i++) { for (size_t i = 0; i < NUM_THINKLEVELS; i++) {
m_Think[i] = THINK_VOID; m_Think[i] = THINK_VOID;
m_ThinkStates[i] = THINKSTATE_VOID; m_ThinkStates[i] = THINKSTATE_VOID;
@ -7814,7 +7815,7 @@ Suspend current think state.
*/ */
void Actor::SuspendState(void) void Actor::SuspendState(void)
{ {
GlobalFuncs_t *think = &GlobalFuncs[m_Think[m_ThinkLevel]]; GlobalFuncs_t *think = &GlobalFuncs[CurrentThink()];
if (think->SuspendState) { if (think->SuspendState) {
(this->*think->SuspendState)(); (this->*think->SuspendState)();
@ -7830,7 +7831,7 @@ Resume current think state.
*/ */
void Actor::ResumeState(void) void Actor::ResumeState(void)
{ {
GlobalFuncs_t *think = &GlobalFuncs[m_Think[m_ThinkLevel]]; GlobalFuncs_t *think = &GlobalFuncs[CurrentThink()];
if (think->ResumeState) { if (think->ResumeState) {
(this->*think->ResumeState)(); (this->*think->ResumeState)();
@ -7849,7 +7850,7 @@ void Actor::BeginState(void)
GlobalFuncs_t *think; GlobalFuncs_t *think;
m_Think[m_ThinkLevel] = m_ThinkMap[m_ThinkState]; m_Think[m_ThinkLevel] = m_ThinkMap[m_ThinkState];
think = &GlobalFuncs[m_Think[m_ThinkLevel]]; think = &GlobalFuncs[CurrentThink()];
if (think->BeginState) { if (think->BeginState) {
(this->*think->BeginState)(); (this->*think->BeginState)();
@ -7890,7 +7891,7 @@ Restart current think state.
*/ */
void Actor::RestartState(void) void Actor::RestartState(void)
{ {
GlobalFuncs_t *think = &GlobalFuncs[m_Think[m_ThinkLevel]]; GlobalFuncs_t *think = &GlobalFuncs[CurrentThink()];
if (think->RestartState) { if (think->RestartState) {
(this->*think->RestartState)(); (this->*think->RestartState)();