#include "train.qh"
.float train_wait_turning;
+.entity future_target;
void train_next(entity this);
#ifdef SVQC
void train_use(entity this, entity actor, entity trigger);
{
entity targ, cp;
vector ang;
- targ = find(NULL, targetname, this.target);
+ targ = this.future_target;
if((this.spawnflags & 1) && targ.curvetarget)
cp = find(NULL, targetname, targ.curvetarget);
else
ang_x = -ang_x; // flip up / down orientation
if(this.wait > 0) // slow turning
- SUB_CalcAngleMove(this, ang, TSPEED_TIME, this.SUB_LTIME - time + this.wait, train_wait);
+ SUB_CalcAngleMove(this, ang, TSPEED_TIME, this.ltime - time + this.wait, train_wait);
else // instant turning
SUB_CalcAngleMove(this, ang, TSPEED_TIME, 0.0000001, train_wait);
this.train_wait_turning = true;
#endif
#ifdef SVQC
- entity tg = find(NULL, targetname, this.target);
+ entity tg = this.future_target;
if(tg.spawnflags & 4)
{
this.use = train_use;
- SUB_THINK(this, func_null);
- this.SUB_NEXTTHINK = 0;
+ setthink(this, func_null);
+ this.nextthink = 0;
}
else
#endif
}
else
{
- SUB_THINK(this, train_next);
- this.SUB_NEXTTHINK = this.SUB_LTIME + this.wait;
+ setthink(this, train_next);
+ this.nextthink = this.ltime + this.wait;
}
}
-void train_next(entity this)
+entity train_next_find(entity this)
{
- entity targ, cp = NULL;
- vector cp_org = '0 0 0';
- string next_target = "";
-
- targ = find(NULL, targetname, this.target);
- if(targ.target_random)
+ if(this.target_random)
{
RandomSelection_Init();
- for(int i = 0; i < 4; ++i)
+ for(entity t = NULL; (t = find(t, targetname, this.target));)
{
- switch(i)
- {
- case 0:
- next_target = targ.target;
- break;
- case 1:
- next_target = targ.target2;
- break;
- case 2:
- next_target = targ.target3;
- break;
- case 3:
- next_target = targ.target4;
- break;
- }
- if (next_target != "")
- {
- RandomSelection_AddString(next_target, 1, 1);
- }
+ RandomSelection_AddEnt(t, 1, 0);
}
- next_target = RandomSelection_chosen_string;
+ return RandomSelection_chosen_ent;
}
else
{
- next_target = targ.target;
+ return find(NULL, targetname, this.target);
}
+}
+
+void train_next(entity this)
+{
+ entity targ = NULL, cp = NULL;
+ vector cp_org = '0 0 0';
+
+ targ = this.future_target;
+
+ this.target = targ.target;
+ this.target_random = targ.target_random;
+ this.future_target = train_next_find(targ);
- this.target = next_target;
if (this.spawnflags & 1)
{
if(targ.curvetarget)
WriteString(MSG_ENTITY, this.curvetarget);
- WriteCoord(MSG_ENTITY, this.pos1_x);
- WriteCoord(MSG_ENTITY, this.pos1_y);
- WriteCoord(MSG_ENTITY, this.pos1_z);
- WriteCoord(MSG_ENTITY, this.pos2_x);
- WriteCoord(MSG_ENTITY, this.pos2_y);
- WriteCoord(MSG_ENTITY, this.pos2_z);
+ WriteVector(MSG_ENTITY, this.pos1);
+ WriteVector(MSG_ENTITY, this.pos2);
- WriteCoord(MSG_ENTITY, this.size_x);
- WriteCoord(MSG_ENTITY, this.size_y);
- WriteCoord(MSG_ENTITY, this.size_z);
+ WriteVector(MSG_ENTITY, this.size);
- WriteCoord(MSG_ENTITY, this.view_ofs_x);
- WriteCoord(MSG_ENTITY, this.view_ofs_y);
- WriteCoord(MSG_ENTITY, this.view_ofs_z);
+ WriteVector(MSG_ENTITY, this.view_ofs);
WriteAngle(MSG_ENTITY, this.mangle_x);
WriteAngle(MSG_ENTITY, this.mangle_y);
void train_use(entity this, entity actor, entity trigger)
{
- this.SUB_NEXTTHINK = this.SUB_LTIME + 1;
- SUB_THINK(this, train_next);
+ this.nextthink = this.ltime + 1;
+ setthink(this, train_next);
this.use = func_null; // not again
+ if(trigger.target2 && trigger.target2 != "")
+ this.future_target = find(NULL, targetname, trigger.target2);
}
void func_train_find(entity this)
{
- entity targ;
- targ = find(NULL, targetname, this.target);
+ entity targ = train_next_find(this);
this.target = targ.target;
+ this.target_random = targ.target_random;
+ // save the future target for later
+ this.future_target = train_next_find(targ);
if (this.target == "")
objerror(this, "func_train_find: no next target");
- SUB_SETORIGIN(this, targ.origin - this.view_ofs);
+ setorigin(this, targ.origin - this.view_ofs);
if(!(this.spawnflags & 4))
{
- this.SUB_NEXTTHINK = this.SUB_LTIME + 1;
- SUB_THINK(this, train_next);
+ this.nextthink = this.ltime + 1;
+ setthink(this, train_next);
}
train_link(this);
this.curvetarget = strzone(ReadString());
- this.pos1_x = ReadCoord();
- this.pos1_y = ReadCoord();
- this.pos1_z = ReadCoord();
- this.pos2_x = ReadCoord();
- this.pos2_y = ReadCoord();
- this.pos2_z = ReadCoord();
+ this.pos1 = ReadVector();
+ this.pos2 = ReadVector();
- this.size_x = ReadCoord();
- this.size_y = ReadCoord();
- this.size_z = ReadCoord();
+ this.size = ReadVector();
- this.view_ofs_x = ReadCoord();
- this.view_ofs_y = ReadCoord();
- this.view_ofs_z = ReadCoord();
+ this.view_ofs = ReadVector();
this.mangle_x = ReadAngle();
this.mangle_y = ReadAngle();