X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcheats.qc;h=dd1e395c722156026e00d9047a1617eee54b283b;hb=fac33f7b7273746b671ea4cb999cf611bda163e6;hp=94816a1a77d9606f33b8cb5a90a7131425ca2502;hpb=92c61bba87835a1bfd152c4cbb40764647a83656;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index 94816a1a7..dd1e395c7 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -4,7 +4,7 @@ #include "race.qh" #include "../common/triggers/teleporters.qh" -#include "mutators/all.qh" +#include "mutators/_mod.qh" #include "weapons/tracing.qh" @@ -14,9 +14,9 @@ #include -#include "../common/monsters/all.qh" +#include "../common/monsters/_mod.qh" -#include "../common/weapons/all.qh" +#include #include "../common/triggers/subs.qh" @@ -107,10 +107,10 @@ 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("Missing target. FAIL!"); + objerror(this, "Missing target. FAIL!"); return; } vector a = vectoangles(e.origin - this.origin); @@ -123,7 +123,7 @@ spawnfunc(info_autoscreenshot) { if(++num_autoscreenshot > autocvar_g_max_info_autoscreenshot) { - objerror("Too many info_autoscreenshot entitites. FAIL!"); + objerror(this, "Too many info_autoscreenshot entitites. FAIL!"); return; } if(this.target != "") @@ -164,7 +164,7 @@ float CheatImpulse(entity this, int imp) 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); @@ -185,7 +185,8 @@ float CheatImpulse(entity this, int imp) CheatCommand(this, tokenize_console("give all")); break; // already counted as cheat case CHIMPULSE_SPEEDRUN.impulse: - IS_CHEAT(this, imp, 0, 0); + if(!autocvar_g_allow_checkpoints) + IS_CHEAT(this, imp, 0, 0); if(this.personal) { this.speedrunning = true; @@ -222,7 +223,8 @@ float CheatImpulse(entity this, int imp) this.strength_finished = time + this.personal.strength_finished - this.personal.teleport_time; this.invincible_finished = time + this.personal.invincible_finished - this.personal.teleport_time; - DID_CHEAT(); + if(!autocvar_g_allow_checkpoints) + DID_CHEAT(); break; } if(IS_DEAD(this)) @@ -232,15 +234,15 @@ 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"); 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'; @@ -262,7 +264,7 @@ float CheatImpulse(entity this, int imp) 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 @@ -273,8 +275,8 @@ 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); - 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(); @@ -295,7 +297,6 @@ float CheatCommand(entity this, int argc) { float effectnum, f; vector start, end; - entity oldself; case "pointparticles": IS_CHEAT(this, 0, argc, 0); @@ -324,8 +325,8 @@ float CheatCommand(entity this, int argc) // arguments: // effectname effectnum = _particleeffectnum(argv(1)); - W_SetupShot(this, false, false, SND_Null, CH_WEAPON_A, 0); - traceline(w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, MOVE_NORMAL, this); + 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(); break; @@ -339,7 +340,7 @@ float CheatCommand(entity this, int argc) // 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) { @@ -358,14 +359,14 @@ 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) { 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 @@ -445,7 +446,7 @@ float CheatCommand(entity this, int argc) 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)); @@ -475,19 +476,19 @@ 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")); ) - 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; @@ -497,10 +498,10 @@ float CheatCommand(entity this, int argc) { 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) == "*") @@ -519,11 +520,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")); } @@ -538,7 +539,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"); @@ -548,15 +549,15 @@ 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(oldself = world; (oldself = find(oldself, classname, "dragbox_box")); ) + for(entity ent = NULL; (ent = find(ent, classname, "dragbox_box")); ) { - if(e.cnt <= 0 && oldself.cnt == 0 || e.cnt == oldself.cnt) + if(e.cnt <= 0 && ent.cnt == 0 || e.cnt == ent.cnt) { - start = start + oldself.origin; + start = start + ent.origin; ++effectnum; } } @@ -583,12 +584,12 @@ float CheatCommand(entity this, int argc) // these need race_place // counting... effectnum = 1; - for(oldself = world; (oldself = find(oldself, classname, "dragpoint")); ) - if(oldself.cnt == 0) + for(entity ent = NULL; (ent = find(ent, classname, "dragpoint")); ) + if(ent.cnt == 0) { - if(vlen(oldself.origin - start) < vlen(e.origin - start)) + if(vlen2(ent.origin - start) < vlen2(e.origin - start)) ++effectnum; - else if(vlen(oldself.origin - start) == vlen(e.origin - start) && etof(oldself) < etof(e)) + else if(vlen2(ent.origin - start) == vlen2(e.origin - start) && etof(ent) < etof(e)) ++effectnum; } fputs(f, strcat("\"race_place\" \"", ftos(effectnum), "\"\n")); @@ -604,16 +605,16 @@ 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")); ) - 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": @@ -640,29 +641,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; @@ -676,7 +677,7 @@ float CheatCommand(entity this, int argc) entity e = spawn(); e.target = argv(1); SUB_UseTargets(e, this, NULL); - remove(e); + delete(e); DID_CHEAT(); break; case "killtarget": @@ -684,7 +685,7 @@ float CheatCommand(entity this, int argc) entity e2 = spawn(); e2.killtarget = argv(1); SUB_UseTargets(e2, this, NULL); - remove(e2); + delete(e2); DID_CHEAT(); break; case "teleporttotarget": @@ -696,7 +697,7 @@ float CheatCommand(entity this, int argc) if(!wasfreed(ent)) { Simple_TeleportPlayer(ent, this); - remove(ent); + delete(ent); DID_CHEAT(); } break; @@ -734,7 +735,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 @@ -820,7 +822,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) { @@ -868,9 +870,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; @@ -893,12 +895,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: @@ -913,7 +915,7 @@ void Drag_Finish(entity dragger) 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 @@ -923,7 +925,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; @@ -1019,7 +1021,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)) @@ -1036,7 +1038,7 @@ void Drag_MoveDrag(entity from, entity to) { to.draggedby = from.draggedby; to.draggedby.dragentity = to; - from.draggedby = world; + from.draggedby = NULL; } }