summaryrefslogtreecommitdiffstats
path: root/Items.c4d
diff options
context:
space:
mode:
authorMarkus Mittendrein <git@maxmitti.tk>2019-07-29 23:34:02 +0200
committerMarkus Mittendrein <git@maxmitti.tk>2019-07-30 00:13:56 +0200
commitd15afd40b3bf6de59beeaa98d7896b8c2ab7878c (patch)
tree4df85bec17257650b7c53cc6ac4481ad0fc9c557 /Items.c4d
parente8c51f1ea481ac18ce3fb4387c0f87ffe43855e2 (diff)
downloadDTSensors.c4d-d15afd40b3bf6de59beeaa98d7896b8c2ab7878c.tar.gz
DTSensors.c4d-d15afd40b3bf6de59beeaa98d7896b8c2ab7878c.zip
Replace arr[GetLength(arr)] with arr[]
Diffstat (limited to 'Items.c4d')
-rw-r--r--Items.c4d/Sensors.c4d/CardReader.c4d/Keycard.c4d/Script.c2
-rw-r--r--Items.c4d/Sensors.c4d/FingerprintSensor.c4d/Script.c4
-rw-r--r--Items.c4d/Sensors.c4d/ObjectSensor.c4d/Script.c30
-rw-r--r--Items.c4d/Sensors.c4d/Sensor.c4d/Script.c14
4 files changed, 25 insertions, 25 deletions
diff --git a/Items.c4d/Sensors.c4d/CardReader.c4d/Keycard.c4d/Script.c b/Items.c4d/Sensors.c4d/CardReader.c4d/Keycard.c4d/Script.c
index 6490dc2..137461d 100644
--- a/Items.c4d/Sensors.c4d/CardReader.c4d/Keycard.c4d/Script.c
+++ b/Items.c4d/Sensors.c4d/CardReader.c4d/Keycard.c4d/Script.c
@@ -33,7 +33,7 @@ func AddReader(object reader)
{
if(!HasReader(reader))
{
- readers[GetLength(readers)] = reader;
+ readers[] = reader;
CleanRemovedReaders();
if(GetLength(readers) == 1)
{
diff --git a/Items.c4d/Sensors.c4d/FingerprintSensor.c4d/Script.c b/Items.c4d/Sensors.c4d/FingerprintSensor.c4d/Script.c
index 58a673b..049bf48 100644
--- a/Items.c4d/Sensors.c4d/FingerprintSensor.c4d/Script.c
+++ b/Items.c4d/Sensors.c4d/FingerprintSensor.c4d/Script.c
@@ -83,7 +83,7 @@ func SetMasterFinger(id id, object caller)
masterFinger = caller;
if(!IsKnownFinger(caller))
{
- fingers[GetLength(fingers)] = caller;
+ fingers[] = caller;
}
}
}
@@ -117,7 +117,7 @@ func AddFinger(id id, object finger, bool right)
{
if(!IsKnownFinger(finger))
{
- fingers[GetLength(fingers)] = finger;
+ fingers[] = finger;
}
if(right)
{
diff --git a/Items.c4d/Sensors.c4d/ObjectSensor.c4d/Script.c b/Items.c4d/Sensors.c4d/ObjectSensor.c4d/Script.c
index a27a398..d01245c 100644
--- a/Items.c4d/Sensors.c4d/ObjectSensor.c4d/Script.c
+++ b/Items.c4d/Sensors.c4d/ObjectSensor.c4d/Script.c
@@ -48,7 +48,7 @@ func SetupDetection(id id, object caller, int selection)
++menuIndex;
AddMenuItem(Format("$TargetOwner$", ["$All$", "$Allied$", "$Hostile$", 0, "$DenyHostile$", "$DenyAllied$"][hostility]), "ChangeHostility", GetID(), caller, 0, caller, 0, C4MN_Add_ForceNoDesc);
++menuIndex;
-
+
for(var part in [["$DetectDef$", detectCats], ["$DetectDenial$", denyCats]])
{
for(var cat in [[C4D_Vehicle, "$Vehicle$", LORY], [C4D_Living, "$Living$", WIPF], [C4D_Object, "$Object$", ROCK]])
@@ -60,7 +60,7 @@ func SetupDetection(id id, object caller, int selection)
}
}
}
-
+
for(var part in [["$DetectDef$", detectIDs], ["$DetectException$", exceptIDs], ["$DetectDenial$", denyIDs]])
{
for(var i = 1; i < GetLength(part[1]); ++i)
@@ -109,16 +109,16 @@ func RemoveDef(id id, int indexPO, bool right)
{
if(denial)
{
- denyIDs[GetLength(denyIDs)] = part;
+ denyIDs[] = part;
}
else
{
- detectIDs[GetLength(detectIDs)] = part;
+ detectIDs[] = part;
}
}
else
{
- exceptIDs[GetLength(exceptIDs)] = part;
+ exceptIDs[] = part;
}
}
SetupDetection(0, selectCaller, indexPO - 1);
@@ -143,15 +143,15 @@ func AddType(id id, object caller, int selection)
var def = GetID(obj);
if(GetIndexOf(def, defs) == -1 && GetIndexOf2([C4FO_ID, def], detectIDs) == -1 && GetIndexOf2([C4FO_ID, def], exceptIDs) == -1)
{
- defs[GetLength(defs)] = def;
+ defs[] = def;
}
}
-
+
for(def in defs)
{
AddMenuItem(GetName(0, def), "AddDef", def, caller, 0, ++menuIndex, 0, C4MN_Add_ForceNoDesc);
}
-
+
SelectMenuItem(selection - 1, caller);
SelectMenuItem(selection, caller);
}
@@ -174,11 +174,11 @@ func AddDef(id id, int indexPO, bool right)
{
if(right)
{
- exceptIDs[GetLength(exceptIDs)] = [C4FO_ID, id];
+ exceptIDs[] = [C4FO_ID, id];
}
else
{
- detectIDs[GetLength(detectIDs)] = [C4FO_ID, id];
+ detectIDs[] = [C4FO_ID, id];
}
AddType(0, selectCaller, indexPO - 1);
}
@@ -246,24 +246,24 @@ func Check(bool retrigger)
var hostilityDenyCond = [0, Find_Hostile(GetOwner(this)), Find_Not(Find_Hostile(GetOwner(this)))][hostility - 3];
if(GetLength(exceptIDs) > 1)
{
- additionalConds[GetLength(additionalConds)] = Find_Not(exceptIDs);
+ additionalConds[] = Find_Not(exceptIDs);
}
if(hostilityCond)
{
- additionalConds[GetLength(additionalConds)] = hostilityCond;
+ additionalConds[] = hostilityCond;
}
var additionalDenyConds = [C4FO_Or];
if(denyIDs)
{
- additionalDenyConds[GetLength(additionalDenyConds)] = denyIDs;
+ additionalDenyConds[] = denyIDs;
}
if(denyCats)
{
- additionalDenyConds[GetLength(additionalDenyConds)] = Find_Category(denyCats);
+ additionalDenyConds[] = Find_Category(denyCats);
}
if(hostilityDenyCond)
{
- additionalDenyConds[GetLength(additionalDenyConds)] = Find_And(Find_Or(detectIDs, detectCats && Find_Category(detectCats)), hostilityDenyCond);
+ additionalDenyConds[] = Find_And(Find_Or(detectIDs, detectCats && Find_Category(detectCats)), hostilityDenyCond);
}
ClearParticles("PSpark", this);
if(GetLength(additionalDenyConds) > 1 && (obj = FindObject2(Find_Exclude(this), posCond, Find_NoContainer(), Find_Category(C4D_Living | C4D_Object | C4D_Vehicle), IgnoreSensorIgnored(), additionalDenyConds)))
diff --git a/Items.c4d/Sensors.c4d/Sensor.c4d/Script.c b/Items.c4d/Sensors.c4d/Sensor.c4d/Script.c
index 30bf933..e73b3cc 100644
--- a/Items.c4d/Sensors.c4d/Sensor.c4d/Script.c
+++ b/Items.c4d/Sensors.c4d/Sensor.c4d/Script.c
@@ -220,7 +220,7 @@ func RemoveSensorTarget(id id, object caller)
if(CheckTarget(j, i))
{
AddMenuItem(Format("%s: {{%i}} %s -> %s", triggerInfo[0], GetID(callback[0]), GetName(callback[0]), callback[1][0]), Format("RemoveSensorTargetIndex(%d, %d, Object(%d), %d)", j, i - 1, ObjectNumber(caller), cnt++), callback[1][2] || GetID(), caller, 0, 0, 0, C4MN_Add_ForceNoDesc);
- triggerTargetList[GetLength(triggerTargetList)] = callback[0];
+ triggerTargetList[] = callback[0];
}
}
}
@@ -367,12 +367,12 @@ global func GetSensorCallbacks(object sensor)
{
if(GetType(name = this->~GetTriggerName(i)) == C4V_String)
{
- ret[GetLength(ret)] = [name, BindCallback("Trigger", [Bind(i), Bind(sensor), 0])]; // 0 = user, rest = other args passed to trigger
+ ret[] = [name, BindCallback("Trigger", [Bind(i), Bind(sensor), 0])]; // 0 = user, rest = other args passed to trigger
// WARNING: update mapping when necessary
}
else if(name = this->~ConsoleControl(i))
{
- ret[GetLength(ret)] = [name, BindCallback(SN7I->Callback("HazardCallback"), [Bind(i), Bind(this), Bind(ObjectNumber(sensor)), 0])]; // 0 = user, rest = other args passed to trigger
+ ret[] = [name, BindCallback(SN7I->Callback("HazardCallback"), [Bind(i), Bind(this), Bind(ObjectNumber(sensor)), 0])]; // 0 = user, rest = other args passed to trigger
// WARNING: update mapping when necessary
}
else
@@ -385,7 +385,7 @@ global func GetSensorCallbacks(object sensor)
{
for(var mapping in this->~RemoteControlMap(sensor))
{
- ret[GetLength(ret)] = [mapping[2] || Format("$Control$", RC7I->GetControlName(mapping[0])), mapping[1]];
+ ret[] = [mapping[2] || Format("$Control$", RC7I->GetControlName(mapping[0])), mapping[1]];
}
}
if(GetLength(ret) > 0)
@@ -416,7 +416,7 @@ func SelectSensorTarget(id id, int index, bool right)
}
else
{
- selectTrigger[GetLength(selectTrigger)] = index;
+ selectTrigger[] = index;
}
}
else
@@ -460,7 +460,7 @@ func SelectSensorTarget2(id id, int index, bool right)
}
else
{
- selectTrigger[GetLength(selectTrigger)] = index;
+ selectTrigger[] = index;
}
}
else
@@ -724,7 +724,7 @@ func AddTargetAction(int trigger, object target, callback)
{
triggerCallbacks = triggerCallbacks || [];
triggerCallbacks[trigger] = triggerCallbacks[trigger] || [];
- triggerCallbacks[trigger][GetLength(triggerCallbacks[trigger])] = [target, callback];
+ triggerCallbacks[trigger][] = [target, callback];
}
func Trigger(int index, object user)