Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-08 03:27:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Moved location of actor methods

Browse source
This commit is contained in:
smallmodel 2023-10-12 20:17:09 +02:00
parent 3dbf957304
commit c55a78b8b4
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
12 changed files with 670 additions and 678 deletions
Download patch file Download diff file Expand all files Collapse all files

140
code/fgame/actor_machinegunner.cpp
View file

@ -37,6 +37,11 @@ void Actor::InitMachineGunner(GlobalFuncs_t *func)
func->FinishedAnimation = &Actor::FinishedAnimation_MachineGunner;
}
bool Actor::IsMachineGunnerState(int state)
{
return true;
}
void Actor::Begin_MachineGunner(void)
{
m_csMood = STRING_ALERT;
@ -92,75 +97,6 @@ void Actor::End_MachineGunner(void)
}
void Actor::ThinkHoldGun_TurretGun(void)
{
// FIXME: unimplemented
}
void Actor::Think_MachineGunner_TurretGun(void)
{
// FIXME: unimplemented
}
void Actor::Think_MachineGunner(void)
{
if (RequireThink()) {
if (m_pTurret && m_pTurret->GetOwner() == this && !m_bNoPlayerCollision) {
if (!m_bEnableEnemy) {
ThinkHoldGun();
return;
}
if (level.inttime < m_iEnemyCheckTime + 200) {
ThinkHoldGun();
return;
}
m_iEnemyCheckTime = level.inttime;
if (m_pTurret->AI_CanTarget(G_GetEntity(0)->centroid)) {
ThinkHoldGun();
return;
}
if (!m_pGrenade || m_fGrenadeAwareness < rand() * 0.000000046566129) {
if (!G_SightTrace(
EyePosition(),
vec_zero,
vec_zero,
G_GetEntity(0)->centroid,
this,
G_GetEntity(0),
33819417,
qfalse,
"Actor::Think_MachineGunner"
)) {
ThinkHoldGun();
return;
}
if (m_ThinkStates[THINKLEVEL_NORMAL] != THINKSTATE_IDLE) {
BecomeTurretGuy();
return;
}
if (m_Enemy && !m_Enemy->IsSubclassOfActor() && !EnemyIsDisguised()
&& m_PotentialEnemies.GetCurrentVisibility() >= 1) {
BecomeTurretGuy();
return;
}
if (!m_Enemy || !m_Enemy->IsSubclassOfActor() || EnemyIsDisguised()
|| m_PotentialEnemies.GetCurrentVisibility() > 1) {
ThinkHoldGun();
return;
}
SetCuriousAnimHint(6);
}
}
BecomeTurretGuy();
}
}
void Actor::ThinkHoldGun(void)
{
Vector end;
trace_t trace;
@ -252,7 +188,7 @@ void Actor::ThinkHoldGun(void)
end = start;
end.z = origin.z - 94.0;
trace = G_Trace(start, MINS, MAXS, end, this, 1107437825, qfalse, "Actor::ThinkHoldGun");
trace = G_Trace(start, MINS, MAXS, end, this, 1107437825, qfalse, "Actor::ThinkHoldGun_TurretGun");
if (trace.fraction != 1.0 && !trace.startsolid && !trace.allsolid && trace.ent) {
SafeSetOrigin(trace.endpos);
@ -264,6 +200,70 @@ void Actor::ThinkHoldGun(void)
UpdateFootsteps();
}
void Actor::Think_MachineGunner_TurretGun(void)
{
// FIXME: unimplemented
}
void Actor::Think_MachineGunner(void)
{
if (RequireThink()) {
if (m_pTurret && m_pTurret->GetOwner() == this && !m_bNoPlayerCollision) {
if (!m_bEnableEnemy) {
ThinkHoldGun_TurretGun();
return;
}
if (level.inttime < m_iEnemyCheckTime + 200) {
ThinkHoldGun_TurretGun();
return;
}
m_iEnemyCheckTime = level.inttime;
if (m_pTurret->AI_CanTarget(G_GetEntity(0)->centroid)) {
ThinkHoldGun_TurretGun();
return;
}
if (!m_pGrenade || m_fGrenadeAwareness < rand() * 0.000000046566129) {
if (!G_SightTrace(
EyePosition(),
vec_zero,
vec_zero,
G_GetEntity(0)->centroid,
this,
G_GetEntity(0),
33819417,
qfalse,
"Actor::Think_MachineGunner"
)) {
ThinkHoldGun_TurretGun();
return;
}
if (m_ThinkStates[THINKLEVEL_NORMAL] != THINKSTATE_IDLE) {
BecomeTurretGuy();
return;
}
if (m_Enemy && !m_Enemy->IsSubclassOfActor() && !EnemyIsDisguised()
&& m_PotentialEnemies.GetCurrentVisibility() >= 1) {
BecomeTurretGuy();
return;
}
if (!m_Enemy || !m_Enemy->IsSubclassOfActor() || EnemyIsDisguised()
|| m_PotentialEnemies.GetCurrentVisibility() > 1) {
ThinkHoldGun_TurretGun();
return;
}
SetCuriousAnimHint(6);
}
}
BecomeTurretGuy();
}
}
void Actor::FinishedAnimation_MachineGunner(void)
{
if (!m_bAnimScriptSet && m_State == 1201) {