Merge branch 'Mario/teams_bitflag' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cheats.qc

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index e92a6082a77d2486c562cd7e03604558ed363714..86f46b067f28679d19958c57feac658144e364dc 100644 (file)
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -107,7 +107,7 @@ float num_autoscreenshot;
 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!");
@@ -232,9 +232,9 @@ float CheatImpulse(entity this, int imp)
                        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");
@@ -273,7 +273,7 @@ float CheatImpulse(entity this, int imp)
 
                        e2 = spawn();
                        setorigin(e2, e.origin);
-                       RadiusDamage(e2, this, 1000, 0, 128, world, world, 500, DEATH_CHEAT.m_id, e);
+                       RadiusDamage(e2, this, 1000, 0, 128, NULL, NULL, 500, DEATH_CHEAT.m_id, e);
                        remove(e2);
 
                        LOG_INFO("404 Sportsmanship not found.\n");
@@ -357,7 +357,7 @@ float CheatCommand(entity this, int argc)
                                                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)
                                        {
@@ -474,9 +474,9 @@ float CheatCommand(entity this, int argc)
                        IS_CHEAT(this, 0, argc, 0);
                        RandomSelection_Init();
                        crosshair_trace(this);
-                       for(entity e = world; (e = find(e, classname, "dragbox_box")); )
+                       for(entity e = NULL; (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")); )
+                       for(entity e = NULL; (e = find(e, classname, "dragpoint")); )
                                RandomSelection_Add(e, 0, string_null, 1, 1 / vlen(e.origin + (e.mins + e.maxs) * 0.5 - trace_endpos));
                        if(RandomSelection_chosen_ent)
                        {
@@ -496,9 +496,9 @@ float CheatCommand(entity this, int argc)
                        {
                                RandomSelection_Init();
                                crosshair_trace(this);
-                               for(entity e = world; (e = find(e, classname, "dragbox_box")); )
+                               for(entity e = NULL; (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")); )
+                               for(entity e = NULL; (e = find(e, classname, "dragpoint")); )
                                        RandomSelection_Add(e, 0, string_null, 1, 1 / vlen(e.origin + (e.mins + e.maxs) * 0.5 - trace_endpos));
                                if(RandomSelection_chosen_ent)
                                {
@@ -518,11 +518,11 @@ float CheatCommand(entity this, int argc)
                        {
                                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"));
                                }
@@ -537,7 +537,7 @@ float CheatCommand(entity this, int argc)
                        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");
@@ -547,11 +547,11 @@ float CheatCommand(entity this, int argc)
                                        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)
                                                {
@@ -582,7 +582,7 @@ float CheatCommand(entity this, int argc)
                                                        // 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))
@@ -603,15 +603,15 @@ float CheatCommand(entity this, int argc)
                        break;
                case "drag_clear":
                        IS_CHEAT(this, 0, argc, 0);
-                       for(entity e = world; (e = find(e, classname, "dragbox_box")); )
+                       for(entity e = NULL; (e = find(e, classname, "dragbox_box")); )
                                remove(e);
-                       for(entity e = world; (e = find(e, classname, "dragbox_corner_1")); )
+                       for(entity e = NULL; (e = find(e, classname, "dragbox_corner_1")); )
                                remove(e);
-                       for(entity e = world; (e = find(e, classname, "dragbox_corner_2")); )
+                       for(entity e = NULL; (e = find(e, classname, "dragbox_corner_2")); )
                                remove(e);
-                       for(entity e = world; (e = find(e, classname, "dragpoint")); )
+                       for(entity e = NULL; (e = find(e, classname, "dragpoint")); )
                                remove(e);
-                       for(entity e = world; (e = find(e, classname, "drag_digit")); )
+                       for(entity e = NULL; (e = find(e, classname, "drag_digit")); )
                                remove(e);
                        DID_CHEAT();
                        break;
@@ -639,29 +639,29 @@ float CheatCommand(entity this, int argc)
                        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;
@@ -733,7 +733,8 @@ float CheatFrame(entity this)
                        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
@@ -819,7 +820,7 @@ float Drag(entity this, float force_allow_pick, float ischeat)
                                                        // 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)
                                                                {
@@ -867,9 +868,9 @@ void Drag_Begin(entity dragger, entity draggee, vector touchpoint)
 {
        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;
@@ -892,12 +893,12 @@ void Drag_Finish(entity 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:
@@ -922,7 +923,7 @@ void Drag_Finish(entity dragger)
 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;
@@ -1018,7 +1019,7 @@ float Drag_IsDragging(entity dragger)
                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))
@@ -1035,7 +1036,7 @@ void Drag_MoveDrag(entity from, entity to)
        {
                to.draggedby = from.draggedby;
                to.draggedby.dragentity = to;
-               from.draggedby = world;
+               from.draggedby = NULL;
        }
 }