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

Fixed DetectSmokeGrenades and LookAt crash

Browse source
This commit is contained in:
smallmodel 2023-10-18 19:59:23 +02:00
parent 3486b590eb
commit f82b6b75ff
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
1 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

62
code/fgame/actor.cpp
View file

@ -4493,8 +4493,10 @@ Change current look entity.
void Actor::LookAt(Listener *l)
{
ClearLookEntity();
if (!l && (g_showlookat->integer == entnum || g_showlookat->integer == -1)) {
Com_Printf("Script lookat: %i %i %s cleared lookat\n", entnum, radnum, TargetName().c_str());
if (!l) {
if (g_showlookat->integer == entnum || g_showlookat->integer == -1) {
Com_Printf("Script lookat: %i %i %s cleared lookat\n", entnum, radnum, TargetName().c_str());
}
return;
}
@ -4856,7 +4858,7 @@ Give weapon to actor.
*/
void Actor::EventGiveWeapon(Event *ev)
{
Event e1(EV_Listener_ExecuteScript);
Event event(EV_Listener_ExecuteScript);
str weapName = ev->GetString(1);
weapName.tolower();
@ -4871,14 +4873,10 @@ void Actor::EventGiveWeapon(Event *ev)
setModel();
e1.AddConstString(STRING_GLOBAL_WEAPON_SCR);
e1.AddString(weapName);
gi.Printf(
"EventGiveWeapon script: %s weapName: %s \n",
Director.GetString(STRING_GLOBAL_WEAPON_SCR).c_str(),
weapName.c_str()
);
ExecuteScript(&e1);
event.AddConstString(STRING_GLOBAL_WEAPON_SCR);
event.AddString(weapName);
ExecuteScript(&event);
}
/*
@ -6433,26 +6431,30 @@ void Actor::DetectSmokeGrenades(void)
}
sprite = G_GetRandomSmokeSprite();
if (!sprite || !sprite->owner || sprite->owner->m_Team == m_Team) {
Vector eyePos;
float fDistSquared;
if (!sprite || !sprite->owner) {
return;
}
eyePos = VirtualEyePosition();
fDistSquared = (sprite->origin - eyePos).lengthSquared();
if (fDistSquared > 65536 || InFOV(sprite->origin) == true) {
if (G_SightTrace(
eyePos,
vec_zero,
vec_zero,
sprite->origin,
this,
NULL,
MASK_CANSEE,
qfalse,
"Actor::DetectSmokeGrenades"
)) {
m_PotentialEnemies.ConfirmEnemy(this, sprite->owner);
}
if (sprite->owner->m_Team != m_Team) {
return;
}
const Vector eyePos = VirtualEyePosition();
const float fDistSquared = (sprite->origin - eyePos).lengthSquared();
if (fDistSquared > Square(256) || InFOV(sprite->origin)) {
if (G_SightTrace(
eyePos,
vec_zero,
vec_zero,
sprite->origin,
this,
NULL,
MASK_CANSEE,
qfalse,
"Actor::DetectSmokeGrenades"
)) {
m_PotentialEnemies.ConfirmEnemy(this, sprite->owner);
}
}
}