Allow "-1" in description to be after "#" character, take 2.

This is a safer way to implement #66, as that fix broke [AV]select.
This commit is contained in:
Sei Lisa 2018-03-04 01:30:01 +01:00 committed by Sei-Lisa
parent bb1cf35948
commit 897507e679

View file

@ -177,7 +177,8 @@ wipe_sit_targets()
integer i; integer i;
for (; i <= llGetNumberOfPrims(); i++) for (; i <= llGetNumberOfPrims(); i++)
{ {
if ((string)llGetLinkPrimitiveParams(i, [PRIM_DESC]) != "-1") string desc = (string)llGetLinkPrimitiveParams(i, [PRIM_DESC]);
if (desc != "-1" && "#-1" != llGetSubString(desc, -3, -1))
{ {
llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION); llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION);
} }
@ -315,7 +316,8 @@ set_sittarget()
{ {
target = 0; target = 0;
} }
if ((string)llGetLinkPrimitiveParams(target, [PRIM_DESC]) != "-1") string desc = (string)llGetLinkPrimitiveParams(target, [PRIM_DESC]);
if (desc != "-1" && "#-1" != llGetSubString(desc, -3, -1))
{ {
llLinkSitTarget(target, target_pos - <0.,0.,0.4> + llRot2Up(target_rot) * 0.05, target_rot); llLinkSitTarget(target, target_pos - <0.,0.,0.4> + llRot2Up(target_rot) * 0.05, target_rot);
} }
@ -477,7 +479,8 @@ default
// wipe_sit_targets() inlined here: // wipe_sit_targets() inlined here:
for (i = 0; i <= llGetNumberOfPrims(); i++) for (i = 0; i <= llGetNumberOfPrims(); i++)
{ {
if ((string)llGetLinkPrimitiveParams(i, [PRIM_DESC]) != "-1") string desc = (string)llGetLinkPrimitiveParams(i, [PRIM_DESC]);
if (desc != "-1" && "#-1" != llGetSubString(desc, -3, -1))
{ {
llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION); llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION);
} }
@ -1046,7 +1049,8 @@ default
// wipe_sit_targets() inlined here: // wipe_sit_targets() inlined here:
for (i = 0; i <= llGetNumberOfPrims(); i++) for (i = 0; i <= llGetNumberOfPrims(); i++)
{ {
if ((string)llGetLinkPrimitiveParams(i, [PRIM_DESC]) != "-1") string desc = (string)llGetLinkPrimitiveParams(i, [PRIM_DESC]);
if (desc != "-1" && "#-1" != llGetSubString(desc, -3, -1))
{ {
llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION); llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION);
} }