scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-09 17:52:08 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix for Mantis 3018: Setting a weapon's Target/HomingObject/HomingPosition etc doesn't work

Browse Source 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10494 387891d4-d844-0410-90c0-e4c51a9137d3
This commit is contained in:
m_m authored and niffiwan committed 2014-03-30 12:39:54 +10:00
1 parent 083905b4f8
commit 626269d4a4
1 file changed
+8 -17
Download Patch File Download Diff File Expand all files Collapse all files
code/parse/lua.cpp
+8 -17
View File
@@ -9801,14 +9801,12 @@ ADE_VIRTVAR(Target, l_Weapon, "object", "Target of weapon. Value may also be a d
{
if(wp->target_sig != newh->sig)
{
wp->target_num = OBJ_INDEX(newh->objp);
wp->target_sig = newh->sig;
weapon_set_tracking_info(OBJ_INDEX(objh->objp), objh->objp->parent, OBJ_INDEX(newh->objp), 1);
}
}
else
{
wp->target_num = -1;
wp->target_sig = 0;
weapon_set_tracking_info(OBJ_INDEX(objh->objp), objh->objp->parent, -1);
}
}
@@ -9870,20 +9868,16 @@ ADE_VIRTVAR(HomingObject, l_Weapon, "object", "Object that weapon will home in o
if(ADE_SETTING_VAR)
{
if(newh != NULL && newh->IsValid())
if (newh != NULL && newh->IsValid())
{
if(wp->target_sig != newh->sig)
if (wp->target_sig != newh->sig)
{
wp->homing_object = newh->objp;
wp->homing_pos = newh->objp->pos;
wp->homing_subsys = NULL;
weapon_set_tracking_info(OBJ_INDEX(objh->objp), objh->objp->parent, OBJ_INDEX(newh->objp), 1);
}
}
else
{
wp->homing_object = NULL;
wp->homing_pos = vmd_zero_vector;
wp->homing_subsys = NULL;
weapon_set_tracking_info(OBJ_INDEX(objh->objp), objh->objp->parent, -1);
}
}
@@ -9893,7 +9887,8 @@ ADE_VIRTVAR(HomingObject, l_Weapon, "object", "Object that weapon will home in o
return ade_set_object_with_breed(L, OBJ_INDEX(wp->homing_object));
}
ADE_VIRTVAR(HomingPosition, l_Weapon, "vector", "Position that weapon will home in on (World vector)", "vector", "Homing point, or null vector if weapon handle is invalid")
ADE_VIRTVAR(HomingPosition, l_Weapon, "vector", "Position that weapon will home in on (World vector), setting this without a homing object in place will not have any effect!",
"vector", "Homing point, or null vector if weapon handle is invalid")
{
object_h *objh;
vec3d *v3;
@@ -9913,14 +9908,10 @@ ADE_VIRTVAR(HomingPosition, l_Weapon, "vector", "Position that weapon will home
{
if(v3 != NULL)
{
wp->homing_object = NULL;
wp->homing_subsys = NULL;
wp->homing_pos = *v3;
}
else
{
wp->homing_object = NULL;
wp->homing_subsys = NULL;
wp->homing_pos = vmd_zero_vector;
}
}