summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Mittendrein <maxmitti@maxmitti.tk>2022-02-19 22:04:25 +0100
committerMarkus Mittendrein <maxmitti@maxmitti.tk>2022-02-19 22:04:25 +0100
commit4401a9c5a96656561ff6d0f5c47e0e2a55599a3a (patch)
tree508784fb974b7be35d77c238298f4197f9e965ac
parent35c071c3df89ea3b8b0a99d59892bcb8bff33f93 (diff)
downloadDTSensors.c4d-master.tar.gz
DTSensors.c4d-master.zip
Remove now unnecessary preprocessor workaroundHEADmaster
-rw-r--r--Items.c4d/Sensors.c4d/RC.c4d/Script.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/Items.c4d/Sensors.c4d/RC.c4d/Script.c b/Items.c4d/Sensors.c4d/RC.c4d/Script.c
index 75d3157..3a91a1d 100644
--- a/Items.c4d/Sensors.c4d/RC.c4d/Script.c
+++ b/Items.c4d/Sensors.c4d/RC.c4d/Script.c
@@ -6,7 +6,6 @@ local user;
local controlTimer;
local realAttachPos;
-// _enum(RC7I_Control_, L, LS, LD, LR, R, RS, RD, RR, U, US, UD, UR, D, DS, DD, DR, T, TS, TD, TR, Q, QS, QD, QR, S, SS, SD, SR, Z, ZS, ZD, ZR, V)
static const RC7I_Control_L = 0;
static const RC7I_Control_LS = 1;
static const RC7I_Control_LD = 2;
@@ -646,13 +645,13 @@ global func FxIntJnRAimTimer(object target, int number, int time)
// Controller weg?
var controller = EffectVar(2, target, number);
if(!controller) return(-1);
-
+
// Controller muss Fahrzeug anfassen
if(target)
if(target->GetCategory() & C4D_Vehicle)
if(controller->GetProcedure() != "PUSH" || (controller->GetActionTarget() != target && GetID(controller->GetActionTarget()) != RC7I))
return FX_Execute_Kill;
-
+
if(target)
target->AimConf(EffectVar(0, target, number), EffectVar(1, target, number), EffectVar(2, target, number));
else if(EffectVar(3, target, number))