#include "spiderbot.qh"
-#ifdef IMPLEMENTATION
-
const int SBRM_FIRST = 1;
const int SBRM_VOLLY = 1;
const int SBRM_GUIDE = 2;
.entity weaponentity = weaponentities[slot];
this.(weaponentity).m_switchweapon = WEP_Null;
}
- this.vehicle_weapon2mode = vehic.vehicle_weapon2mode;
+ STAT(VEHICLESTAT_W2MODE, this) = STAT(VEHICLESTAT_W2MODE, vehic);
#if 1 // 0 to enable per-gun impact aux crosshairs
}
if (!PHYS_INPUT_BUTTON_JUMP(this))
- PHYS_INPUT_BUTTON_JUMP(vehic) = false;
+ vehic.button2 = false;
- if((IS_ONGROUND(vehic)) && PHYS_INPUT_BUTTON_JUMP(this) && !PHYS_INPUT_BUTTON_JUMP(vehic) && vehic.tur_head.wait < time)
+ if((IS_ONGROUND(vehic)) && PHYS_INPUT_BUTTON_JUMP(this) && !vehic.button2 && vehic.tur_head.wait < time)
{
sound (vehic, CH_TRIGGER_SINGLE, SND_VEH_SPIDERBOT_JUMP, VOL_VEHICLEENGINE, ATTEN_NORM);
//dprint("spiderbot_jump:", ftos(soundlength("vehicles/spiderbot_jump.wav")), "\n");
vehic.tur_head.wait = time + 2;
vehic.jump_delay = time + 2;
- PHYS_INPUT_BUTTON_JUMP(vehic) = true; // set spider's jump
+ vehic.button2 = true; // set spider's jump
//PHYS_INPUT_BUTTON_JUMP(this) = false;
vector movefix = '0 0 0';
- if(this.movement_x > 0) movefix_x = 1;
- if(this.movement_x < 0) movefix_x = -1;
- if(this.movement_y > 0) movefix_y = 1;
- if(this.movement_y < 0) movefix_y = -1;
+ if(CS(this).movement_x > 0) movefix_x = 1;
+ if(CS(this).movement_x < 0) movefix_x = -1;
+ if(CS(this).movement_y > 0) movefix_y = 1;
+ if(CS(this).movement_y < 0) movefix_y = -1;
vector rt = movefix_y * v_right;
vector sd = movefix_x * v_forward;
}
else if(time >= vehic.jump_delay)
{
- if(!this.movement)
+ if(!CS(this).movement)
{
if(IS_ONGROUND(vehic))
{
else
{
// Turn Body
- if(this.movement_x == 0 && this.movement_y != 0)
+ if(CS(this).movement_x == 0 && CS(this).movement_y != 0)
ftmp = autocvar_g_vehicle_spiderbot_turnspeed_strafe * PHYS_INPUT_FRAMETIME;
else
ftmp = autocvar_g_vehicle_spiderbot_turnspeed * PHYS_INPUT_FRAMETIME;
vehic.angles_y = anglemods(vehic.angles_y + ftmp);
vehic.tur_head.angles_y -= ftmp;
- if(this.movement_x != 0)
+ if(CS(this).movement_x != 0)
{
- if(this.movement_x > 0)
+ if(CS(this).movement_x > 0)
{
- this.movement_x = 1;
+ CS(this).movement_x = 1;
if(IS_ONGROUND(vehic))
vehic.frame = 0;
}
- else if(this.movement_x < 0)
+ else if(CS(this).movement_x < 0)
{
- this.movement_x = -1;
+ CS(this).movement_x = -1;
if(IS_ONGROUND(vehic))
vehic.frame = 1;
}
- this.movement_y = 0;
+ CS(this).movement_y = 0;
float oldvelz = vehic.velocity_z;
- movelib_move_simple(vehic, normalize(v_forward * this.movement_x),((PHYS_INPUT_BUTTON_JUMP(this)) ? autocvar_g_vehicle_spiderbot_speed_run : autocvar_g_vehicle_spiderbot_speed_walk),autocvar_g_vehicle_spiderbot_movement_inertia);
+ movelib_move_simple(vehic, normalize(v_forward * CS(this).movement_x),((PHYS_INPUT_BUTTON_JUMP(this)) ? autocvar_g_vehicle_spiderbot_speed_run : autocvar_g_vehicle_spiderbot_speed_walk),autocvar_g_vehicle_spiderbot_movement_inertia);
vehic.velocity_z = oldvelz;
float g = ((autocvar_sv_gameplayfix_gravityunaffectedbyticrate) ? 0.5 : 1);
if(vehic.velocity_z <= 20) // not while jumping
//dprint("spiderbot_walk:", ftos(soundlength("vehicles/spiderbot_walk.wav")), "\n");
}
}
- else if(this.movement_y != 0)
+ else if(CS(this).movement_y != 0)
{
- if(this.movement_y < 0)
+ if(CS(this).movement_y < 0)
{
- this.movement_y = -1;
+ CS(this).movement_y = -1;
if(IS_ONGROUND(vehic))
vehic.frame = 2;
}
- else if(this.movement_y > 0)
+ else if(CS(this).movement_y > 0)
{
- this.movement_y = 1;
+ CS(this).movement_y = 1;
if(IS_ONGROUND(vehic))
vehic.frame = 3;
}
float oldvelz = vehic.velocity_z;
- movelib_move_simple(vehic, normalize(v_right * this.movement_y),autocvar_g_vehicle_spiderbot_speed_strafe,autocvar_g_vehicle_spiderbot_movement_inertia);
+ movelib_move_simple(vehic, normalize(v_right * CS(this).movement_y),autocvar_g_vehicle_spiderbot_speed_strafe,autocvar_g_vehicle_spiderbot_movement_inertia);
vehic.velocity_z = oldvelz;
float g = ((autocvar_sv_gameplayfix_gravityunaffectedbyticrate) ? 0.5 : 1);
if(vehic.velocity_z <= 20) // not while jumping
this.vehicle_reload2 = 100 - ((vehic.gun2.cnt - time) / vehic.attack_finished_single[0]) * 100;
setorigin(this, vehic.origin + '0 0 1' * vehic.maxs_z);
+ this.oldorigin = this.origin; // negate fall damage
this.velocity = vehic.velocity;
VEHICLE_UPDATE_PLAYER(this, vehic, health, spiderbot);
void spiderbot_exit(entity this, int eject)
{
entity player = this.owner;
- this.owner = NULL;
IL_EACH(g_projectiles, it.owner == player && it.classname == "spiderbot_rocket",
{
set_movetype(this, MOVETYPE_WALK);
if(!player)
+ {
+ this.owner = NULL; // reset owner anyway?
return;
+ }
makevectors(this.angles);
vector spot;
}
antilag_clear(player, CS(player));
+ this.owner = NULL;
}
void spiderbot_headfade(entity this)
SUB_SetFade(g1, time, min(this.respawntime, 10));
SUB_SetFade(g2, time, min(this.respawntime, 10));
- RadiusDamage (this, this.enemy, 250, 15, 250, NULL, NULL, 250, DEATH_VH_SPID_DEATH.m_id, NULL);
+ RadiusDamage (this, this.enemy, 250, 15, 250, NULL, NULL, 250, DEATH_VH_SPID_DEATH.m_id, DMG_NOWEP, NULL);
this.alpha = this.tur_head.alpha = this.gun1.alpha = this.gun2.alpha = -1;
set_movetype(this, MOVETYPE_NONE);
switch(_imp)
{
case IMP_weapon_group_1.impulse:
- this.vehicle.vehicle_weapon2mode = SBRM_VOLLY;
+ STAT(VEHICLESTAT_W2MODE, this.vehicle) = SBRM_VOLLY;
CSQCVehicleSetup(this, 0);
return true;
case IMP_weapon_group_2.impulse:
- this.vehicle.vehicle_weapon2mode = SBRM_GUIDE;
+ STAT(VEHICLESTAT_W2MODE, this.vehicle) = SBRM_GUIDE;
CSQCVehicleSetup(this, 0);
return true;
case IMP_weapon_group_3.impulse:
- this.vehicle.vehicle_weapon2mode = SBRM_ARTILLERY;
+ STAT(VEHICLESTAT_W2MODE, this.vehicle) = SBRM_ARTILLERY;
CSQCVehicleSetup(this, 0);
return true;
case IMP_weapon_next_byid.impulse:
case IMP_weapon_next_bypriority.impulse:
case IMP_weapon_next_bygroup.impulse:
- this.vehicle.vehicle_weapon2mode += 1;
- if(this.vehicle.vehicle_weapon2mode > SBRM_LAST)
- this.vehicle.vehicle_weapon2mode = SBRM_FIRST;
+ STAT(VEHICLESTAT_W2MODE, this.vehicle) += 1;
+ if(STAT(VEHICLESTAT_W2MODE, this.vehicle) > SBRM_LAST)
+ STAT(VEHICLESTAT_W2MODE, this.vehicle) = SBRM_FIRST;
- //centerprint(this, strcat("Rocket mode is ", ftos(this.vehicle.vehicle_weapon2mode)));
+ //centerprint(this, strcat("Rocket mode is ", ftos(STAT(VEHICLESTAT_W2MODE, this.vehicle))));
CSQCVehicleSetup(this, 0);
return true;
case IMP_weapon_last.impulse:
case IMP_weapon_prev_byid.impulse:
case IMP_weapon_prev_bypriority.impulse:
case IMP_weapon_prev_bygroup.impulse:
- this.vehicle.vehicle_weapon2mode -= 1;
- if(this.vehicle.vehicle_weapon2mode < SBRM_FIRST)
- this.vehicle.vehicle_weapon2mode = SBRM_LAST;
+ STAT(VEHICLESTAT_W2MODE, this.vehicle) -= 1;
+ if(STAT(VEHICLESTAT_W2MODE, this.vehicle) < SBRM_FIRST)
+ STAT(VEHICLESTAT_W2MODE, this.vehicle) = SBRM_LAST;
- //centerprint(this, strcat("Rocket mode is ", ftos(this.vehicle.vehicle_weapon2mode)));
+ //centerprint(this, strcat("Rocket mode is ", ftos(STAT(VEHICLESTAT_W2MODE, this.vehicle))));
CSQCVehicleSetup(this, 0);
return true;
}
METHOD(Spiderbot, vr_enter, void(Spiderbot thisveh, entity instance))
{
- instance.vehicle_weapon2mode = SBRM_GUIDE;
+ STAT(VEHICLESTAT_W2MODE, instance) = SBRM_GUIDE;
set_movetype(instance, MOVETYPE_WALK);
CSQCVehicleSetup(instance.owner, 0);
instance.owner.vehicle_health = (instance.vehicle_health / autocvar_g_vehicle_spiderbot_health) * 100;
}
#endif
-#endif
projects / xonotic / xonotic-data.pk3dir.git / blobdiff