X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fcheats.qc;h=57a09fe3808ac8997b2a557010fb442e24827dc8;hb=21403f1e9510d608415d14bf4348880b9ff42204;hp=9d5da0d415c8b3ff96b03999128fe38aa096f4db;hpb=3ee2789202fff017f74852b4e58b7eca5025a71a;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index 9d5da0d41..57a09fe38 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -89,8 +89,7 @@ float CheatsAllowed(float i, float argc, float fr) // the cheat gets passed as a ADD_CHEATS(self,cheating); \ return attempting #define IS_CHEAT(i,argc,fr) \ - ++attempting; \ - if(!CheatsAllowed(i,argc,fr)) \ + if((++attempting, !CheatsAllowed(i,argc,fr))) \ break float CheatImpulse(float i) @@ -229,7 +228,7 @@ float CheatImpulse(float i) IS_CHEAT(i, 0, 0); FOR_EACH_PLAYER(e) { - get_model_parameters(e.playermodel, e.skinindex); + get_model_parameters(e.playermodel, e.skin); if(get_model_parameters_sex == "Female") { makevectors(e.angles); @@ -664,7 +663,7 @@ float CheatCommand(float argc) END_CHEAT_FUNCTION(); } -float Drag(entity e, float grab); +float Drag(entity e, float grab, float ischeat); void Drag_Begin(entity dragger, entity draggee, vector touchpoint); void Drag_Finish(entity dragger); float Drag_IsDraggable(entity draggee); @@ -683,24 +682,20 @@ float CheatFrame() BEGIN_CHEAT_FUNCTION(); // Dragging can be used as either a cheat, or a function for some objects. If sv_cheats is active, - // the cheat dragging is used (unlimited pickup range and any entity can be carried), even if - // g_grab is enabled. Is sv_cheats is disabled but g_grab is not, normal dragging is - // used (limited pickup range and only dragable objects can be carried), grabbing itself - // no longer being accounted as cheating. If both sv_cheats and g_grab are disabled, players - // attempting to grab objects are reported as trying to cheat. + // the cheat dragging is used (unlimited pickup range and any entity can be carried). If sv_cheats + // is disabled, normal dragging is used (limited pickup range and only dragable objects can be carried), + // grabbing itself no longer being accounted as cheating. switch(0) { default: - if(autocvar_sv_cheats) + if(self.maycheat || (gamestart_sv_cheats && autocvar_sv_cheats)) { // use cheat dragging if cheats are enabled - IS_CHEAT(0, 0, CHRAME_DRAG); crosshair_trace_plusvisibletriggers(self); - if(Drag(trace_ent, TRUE)) - DID_CHEAT(); + Drag(trace_ent, TRUE, TRUE); } - else if(autocvar_g_grab) + else { // drag is TRUE if the object can be picked up. While an object is being carried, the Drag() function // must execute for it either way, otherwise it would cause bugs if it went out of the player's trace. @@ -708,34 +703,29 @@ float CheatFrame() // it goes out of range while slinging it around. float drag; - makevectors(self.v_angle); - WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_sandbox_editor_distance_edit, MOVE_NORMAL, self); - switch(trace_ent.grab) + crosshair_trace_plusvisibletriggers(self); + if(vlen(self.origin - trace_ent.origin) <= autocvar_g_grab_range) { - case 0: // can't grab - break; - case 1: // owner can grab - if(trace_ent.owner == self || trace_ent.realowner == self) - drag = TRUE; - break; - case 2: // owner and team mates can grab - if(trace_ent.owner == self || trace_ent.realowner == self) - drag = TRUE; - if(!IsDifferentTeam(trace_ent.owner, self) || !IsDifferentTeam(trace_ent.realowner, self)) + switch(trace_ent.grab) + { + case 0: // can't grab + break; + case 1: // owner can grab + if(trace_ent.owner == self || trace_ent.realowner == self) + drag = TRUE; + break; + case 2: // owner and team mates can grab + if(!IsDifferentTeam(trace_ent.owner, self) || !IsDifferentTeam(trace_ent.realowner, self) || trace_ent.team == self.team) + drag = TRUE; + break; + case 3: // anyone can grab drag = TRUE; - break; - case 3: // anyone can grab - drag = TRUE; - break; - default: - break; + break; + default: + break; + } } - Drag(trace_ent, drag); // execute dragging - } - else if(self.BUTTON_DRAG) - { - // consider dragging a cheat if g_grab is disabled - IS_CHEAT(0, 0, CHRAME_DRAG); + Drag(trace_ent, drag, FALSE); // execute dragging } break; } @@ -749,59 +739,70 @@ float CheatFrame() // ENTITY DRAGGING -float Drag(entity e, float grab) +float Drag(entity e, float pick, float ischeat) { + BEGIN_CHEAT_FUNCTION(); + // returns TRUE when an entity has been picked up - // If grab is TRUE, the object can also be picked up if it's not being held already - // If grab is FALSE, only keep dragging the object if it's already being held + // If pick is TRUE, the object can also be picked up if it's not being held already + // If pick is FALSE, only keep dragging the object if it's already being held - if(Drag_IsDragging(self)) + switch(0) { - if(self.BUTTON_DRAG) - { - if(self.impulse == 10 || self.impulse == 15 || self.impulse == 18) - { - Drag_MoveForward(self); - self.impulse = 0; - } - else if(self.impulse == 12 || self.impulse == 16 || self.impulse == 19) - { - Drag_MoveBackward(self); - self.impulse = 0; - } - else if(self.impulse >= 1 && self.impulse <= 9) - { - Drag_SetSpeed(self, self.impulse - 1); - } - else if(self.impulse == 14) + default: + if(Drag_IsDragging(self)) { - Drag_SetSpeed(self, 9); - } + if(self.BUTTON_DRAG) + { + if(self.impulse == 10 || self.impulse == 15 || self.impulse == 18) + { + Drag_MoveForward(self); + self.impulse = 0; + } + else if(self.impulse == 12 || self.impulse == 16 || self.impulse == 19) + { + Drag_MoveBackward(self); + self.impulse = 0; + } + else if(self.impulse >= 1 && self.impulse <= 9) + { + Drag_SetSpeed(self, self.impulse - 1); + } + else if(self.impulse == 14) + { + Drag_SetSpeed(self, 9); + } - if(frametime) - Drag_Update(self); - } - else - { - Drag_Finish(self); - } - } - else - { - if(Drag_CanDrag(self)) - if(self.BUTTON_DRAG && grab) + if(frametime) + Drag_Update(self); + } + else + { + Drag_Finish(self); + } + } + else { - if(e) - if(Drag_IsDraggable(e)) + if(Drag_CanDrag(self)) + if(self.BUTTON_DRAG && pick) { - if(e.draggedby) - Drag_Finish(e.draggedby); - if(e.tag_entity) - detach_sameorigin(e); - Drag_Begin(self, e, trace_endpos); - return TRUE; + if(e) + if(Drag_IsDraggable(e)) + { + if(ischeat) + IS_CHEAT(0, 0, CHRAME_DRAG); + if(e.draggedby) + Drag_Finish(e.draggedby); + if(e.tag_entity) + detach_sameorigin(e); + Drag_Begin(self, e, trace_endpos); + if(ischeat) + DID_CHEAT(); + return TRUE; + } } } + break; } return FALSE; }