#include "race.qh"
#include "../common/triggers/teleporters.qh"
-#include "mutators/all.qh"
+#include "mutators/_mod.qh"
#include "weapons/tracing.qh"
#include <common/physics/player.qh>
-#include "../common/monsters/all.qh"
+#include "../common/monsters/_mod.qh"
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
#include "../common/triggers/subs.qh"
void info_autoscreenshot_findtarget(entity this)
{
entity e;
- e = find(world, targetname, this.target);
+ e = find(NULL, targetname, this.target);
if(!e)
{
objerror(this, "Missing target. FAIL!");
this.personal.strength_finished = this.strength_finished;
this.personal.invincible_finished = this.invincible_finished;
this.personal.teleport_time = time;
- break; // this part itthis doesn't cheat, so let's not count this
+ break; // this part itself doesn't cheat, so let's not count this
case CHIMPULSE_CLONE_MOVING.impulse:
IS_CHEAT(this, imp, 0, 0);
makevectors (this.v_angle);
break;
case CHIMPULSE_TELEPORT.impulse:
IS_CHEAT(this, imp, 0, 0);
- if(this.movetype == MOVETYPE_NOCLIP)
+ if(this.move_movetype == MOVETYPE_NOCLIP)
{
- e = find(world, classname, "info_autoscreenshot");
+ e = find(NULL, classname, "info_autoscreenshot");
if(e)
{
sprint(this, "Emergency teleport used info_autoscreenshot location\n");
setorigin(this, e.origin);
this.angles = e.angles;
- remove(e);
+ delete(e);
// should we? this.angles_x = -this.angles_x;
this.fixangle = true;
this.velocity = '0 0 0';
case CHIMPULSE_R00T.impulse:
IS_CHEAT(this, imp, 0, 0);
RandomSelection_Init();
- FOREACH_CLIENT(IS_PLAYER(it) && !IS_DEAD(it) && DIFF_TEAM(it, this), LAMBDA(RandomSelection_Add(it, 0, string_null, 1, 1)));
+ FOREACH_CLIENT(IS_PLAYER(it) && !IS_DEAD(it) && DIFF_TEAM(it, this), LAMBDA(RandomSelection_AddEnt(it, 1, 1)));
if(RandomSelection_chosen_ent)
e = RandomSelection_chosen_ent;
else
e2 = spawn();
setorigin(e2, e.origin);
- RadiusDamage(e2, this, 1000, 0, 128, world, world, 500, DEATH_CHEAT.m_id, e);
- remove(e2);
+ RadiusDamage(e2, this, 1000, 0, 128, NULL, NULL, 500, DEATH_CHEAT.m_id, e);
+ delete(e2);
LOG_INFO("404 Sportsmanship not found.\n");
DID_CHEAT();
// arguments:
// effectname
effectnum = _particleeffectnum(argv(1));
- W_SetupShot(this, false, false, SND_Null, CH_WEAPON_A, 0);
+ W_SetupShot(this, weaponentities[0], false, false, SND_Null, CH_WEAPON_A, 0);
traceline(w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, MOVE_NORMAL, this);
__trailparticles(this, effectnum, w_shotorg, trace_endpos);
DID_CHEAT();
// arguments:
// modelname mode
f = stof(argv(2));
- W_SetupShot(this, false, false, SND_Null, CH_WEAPON_A, 0);
+ W_SetupShot(this, weaponentities[0], false, false, SND_Null, CH_WEAPON_A, 0);
traceline(w_shotorg, w_shotorg + w_shotdir * 2048, MOVE_NORMAL, this);
if((trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) || trace_fraction == 1)
{
e.angles = fixedvectoangles2(trace_plane_normal, v_forward);
e.angles = AnglesTransform_ApplyToAngles(e.angles, '-90 0 0'); // so unrotated models work
}
- WITHSELF(e, spawnfunc_func_breakable(e));
+ spawnfunc_func_breakable(e);
// now, is it valid?
if(f == 0)
{
tracebox(e.origin, e.mins, e.maxs, e.origin, MOVE_NORMAL, e);
if(trace_startsolid)
{
- remove(e);
+ delete(e);
sprint(this, "cannot make stuff there (no space)\n");
}
else
e.nextthink = time;
e.solid = 0; // nothing special
setmodel(e, MDL_MARKER);
- setsize(e, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL));
+ setsize(e, STAT(PL_MIN, this), STAT(PL_MAX, this));
e.skin = 2;
if(argc == 3)
e.cnt = stof(argv(1));
IS_CHEAT(this, 0, argc, 0);
RandomSelection_Init();
crosshair_trace(this);
- for(entity e = world; (e = find(e, classname, "dragbox_box")); )
- RandomSelection_Add(e, 0, string_null, 1, 1 / vlen(e.origin + (e.mins + e.maxs) * 0.5 - trace_endpos));
- for(entity e = world; (e = find(e, classname, "dragpoint")); )
- RandomSelection_Add(e, 0, string_null, 1, 1 / vlen(e.origin + (e.mins + e.maxs) * 0.5 - trace_endpos));
+ for(entity e = NULL; (e = find(e, classname, "dragbox_box")); )
+ RandomSelection_AddEnt(e, 1, 1 / vlen(e.origin + (e.mins + e.maxs) * 0.5 - trace_endpos));
+ for(entity e = NULL; (e = find(e, classname, "dragpoint")); )
+ RandomSelection_AddEnt(e, 1, 1 / vlen(e.origin + (e.mins + e.maxs) * 0.5 - trace_endpos));
if(RandomSelection_chosen_ent)
{
- remove(RandomSelection_chosen_ent.killindicator.killindicator);
- remove(RandomSelection_chosen_ent.killindicator);
+ delete(RandomSelection_chosen_ent.killindicator.killindicator);
+ delete(RandomSelection_chosen_ent.killindicator);
if(RandomSelection_chosen_ent.aiment)
- remove(RandomSelection_chosen_ent.aiment);
+ delete(RandomSelection_chosen_ent.aiment);
if(RandomSelection_chosen_ent.enemy)
- remove(RandomSelection_chosen_ent.enemy);
- remove(RandomSelection_chosen_ent);
+ delete(RandomSelection_chosen_ent.enemy);
+ delete(RandomSelection_chosen_ent);
}
DID_CHEAT();
break;
{
RandomSelection_Init();
crosshair_trace(this);
- for(entity e = world; (e = find(e, classname, "dragbox_box")); )
- RandomSelection_Add(e, 0, string_null, 1, 1 / vlen(e.origin + (e.mins + e.maxs) * 0.5 - trace_endpos));
- for(entity e = world; (e = find(e, classname, "dragpoint")); )
- RandomSelection_Add(e, 0, string_null, 1, 1 / vlen(e.origin + (e.mins + e.maxs) * 0.5 - trace_endpos));
+ for(entity e = NULL; (e = find(e, classname, "dragbox_box")); )
+ RandomSelection_AddEnt(e, 1, 1 / vlen(e.origin + (e.mins + e.maxs) * 0.5 - trace_endpos));
+ for(entity e = NULL; (e = find(e, classname, "dragpoint")); )
+ RandomSelection_AddEnt(e, 1, 1 / vlen(e.origin + (e.mins + e.maxs) * 0.5 - trace_endpos));
if(RandomSelection_chosen_ent)
{
if(substring(argv(1), 0, 1) == "*")
{
f = fopen(argv(1), FILE_WRITE);
fputs(f, "cmd drag_clear\n");
- for(entity e = world; (e = find(e, classname, "dragbox_box")); )
+ for(entity e = NULL; (e = find(e, classname, "dragbox_box")); )
{
fputs(f, strcat("cmd dragbox_spawn ", ftos(e.cnt), " \"", vtos(e.aiment.origin), "\" \"", vtos(e.enemy.origin), "\"\n"));
}
- for(entity e = world; (e = find(e, classname, "dragpoint")); )
+ for(entity e = NULL; (e = find(e, classname, "dragpoint")); )
{
fputs(f, strcat("cmd dragpoint_spawn ", ftos(e.cnt), " \"", vtos(e.origin), "\"\n"));
}
if(argc == 2)
{
f = fopen(argv(1), FILE_WRITE);
- for(entity e = world; (e = find(e, classname, "dragbox_box")); )
+ for(entity e = NULL; (e = find(e, classname, "dragbox_box")); )
{
fputs(f, "{\n");
fputs(f, "\"classname\" \"trigger_race_checkpoint\"\n");
fputs(f, strcat("\"targetname\" \"checkpoint", ftos(e.cnt), "\"\n"));
fputs(f, "}\n");
}
- for(entity e = world; (e = find(e, classname, "dragpoint")); )
+ for(entity e = NULL; (e = find(e, classname, "dragpoint")); )
{
start = '0 0 0';
effectnum = 0;
- for(entity ent = world; (ent = find(ent, classname, "dragbox_box")); )
+ for(entity ent = NULL; (ent = find(ent, classname, "dragbox_box")); )
{
if(e.cnt <= 0 && ent.cnt == 0 || e.cnt == ent.cnt)
{
// these need race_place
// counting...
effectnum = 1;
- for(entity ent = world; (ent = find(ent, classname, "dragpoint")); )
+ for(entity ent = NULL; (ent = find(ent, classname, "dragpoint")); )
if(ent.cnt == 0)
{
if(vlen2(ent.origin - start) < vlen2(e.origin - start))
break;
case "drag_clear":
IS_CHEAT(this, 0, argc, 0);
- for(entity e = world; (e = find(e, classname, "dragbox_box")); )
- remove(e);
- for(entity e = world; (e = find(e, classname, "dragbox_corner_1")); )
- remove(e);
- for(entity e = world; (e = find(e, classname, "dragbox_corner_2")); )
- remove(e);
- for(entity e = world; (e = find(e, classname, "dragpoint")); )
- remove(e);
- for(entity e = world; (e = find(e, classname, "drag_digit")); )
- remove(e);
+ for(entity e = NULL; (e = find(e, classname, "dragbox_box")); )
+ delete(e);
+ for(entity e = NULL; (e = find(e, classname, "dragbox_corner_1")); )
+ delete(e);
+ for(entity e = NULL; (e = find(e, classname, "dragbox_corner_2")); )
+ delete(e);
+ for(entity e = NULL; (e = find(e, classname, "dragpoint")); )
+ delete(e);
+ for(entity e = NULL; (e = find(e, classname, "drag_digit")); )
+ delete(e);
DID_CHEAT();
break;
case "god":
break;
case "noclip":
IS_CHEAT(this, 0, argc, 0);
- if(this.movetype != MOVETYPE_NOCLIP)
+ if(this.move_movetype != MOVETYPE_NOCLIP)
{
- this.movetype = MOVETYPE_NOCLIP;
+ set_movetype(this, MOVETYPE_NOCLIP);
sprint(this, "noclip ON\n");
DID_CHEAT();
}
else
{
- this.movetype = MOVETYPE_WALK;
+ set_movetype(this, MOVETYPE_WALK);
sprint(this, "noclip OFF\n");
}
break;
case "fly":
IS_CHEAT(this, 0, argc, 0);
- if(this.movetype != MOVETYPE_FLY)
+ if(this.move_movetype != MOVETYPE_FLY)
{
- this.movetype = MOVETYPE_FLY;
+ set_movetype(this, MOVETYPE_FLY);
sprint(this, "flymode ON\n");
DID_CHEAT();
}
else
{
- this.movetype = MOVETYPE_WALK;
+ set_movetype(this, MOVETYPE_WALK);
sprint(this, "flymode OFF\n");
}
break;
entity e = spawn();
e.target = argv(1);
SUB_UseTargets(e, this, NULL);
- remove(e);
+ delete(e);
DID_CHEAT();
break;
case "killtarget":
entity e2 = spawn();
e2.killtarget = argv(1);
SUB_UseTargets(e2, this, NULL);
- remove(e2);
+ delete(e2);
DID_CHEAT();
break;
case "teleporttotarget":
if(!wasfreed(ent))
{
Simple_TeleportPlayer(ent, this);
- remove(ent);
+ delete(ent);
DID_CHEAT();
}
break;
if(this.maycheat || (gamestart_sv_cheats && autocvar_sv_cheats))
{
// use cheat dragging if cheats are enabled
- crosshair_trace_plusvisibletriggers(this);
+ //if(Drag_IsDragging(this))
+ //crosshair_trace_plusvisibletriggers(this);
Drag(this, true, true);
}
else
// This also makes sure that an object can only pe picked up if in range, but does not get dropped if
// it goes out of range while slinging it around.
- if(vlen(this.origin - e.origin) <= autocvar_g_grab_range)
+ if(vdist(this.origin - e.origin, <=, autocvar_g_grab_range))
{
switch(e.grab)
{
{
float tagscale;
- draggee.dragmovetype = draggee.movetype;
+ draggee.dragmovetype = draggee.move_movetype;
draggee.draggravity = draggee.gravity;
- draggee.movetype = MOVETYPE_WALK;
+ set_movetype(draggee, MOVETYPE_WALK);
draggee.gravity = 0.00001;
UNSET_ONGROUND(draggee);
draggee.draggedby = dragger;
entity draggee;
draggee = dragger.dragentity;
if(dragger)
- dragger.dragentity = world;
- draggee.draggedby = world;
- draggee.movetype = draggee.dragmovetype;
+ dragger.dragentity = NULL;
+ draggee.draggedby = NULL;
+ set_movetype(draggee, draggee.dragmovetype);
draggee.gravity = draggee.draggravity;
- switch(draggee.movetype)
+ switch(draggee.move_movetype)
{
case MOVETYPE_TOSS:
case MOVETYPE_WALK:
break;
}
- if((draggee.flags & FL_ITEM) && (vlen(draggee.velocity) < 32))
+ if((draggee.flags & FL_ITEM) && (vdist(draggee.velocity, <, 32)))
{
draggee.velocity = '0 0 0';
SET_ONGROUND(draggee); // floating items are FUN
float Drag_IsDraggable(entity draggee)
{
// TODO add more checks for bad stuff here
- if(draggee == world)
+ if(draggee == NULL)
return false;
if(draggee.classname == "func_bobbing")
return false;
return false;
if(wasfreed(dragger.dragentity) || dragger.dragentity.draggedby != dragger)
{
- dragger.dragentity = world;
+ dragger.dragentity = NULL;
return false;
}
if(!Drag_CanDrag(dragger) || !Drag_IsDraggable(dragger.dragentity))
{
to.draggedby = from.draggedby;
to.draggedby.dragentity = to;
- from.draggedby = world;
+ from.draggedby = NULL;
}
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff