Don't allow removal of hardwired waypoints in the editor

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

diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc
index 5a6321772f57cba774037377d1e3415dcf58878d..a7f9554294fc40ad246505743f4721a6b194b199 100644 (file)
--- a/qcsrc/server/impulse.qc
+++ b/qcsrc/server/impulse.qc
@@ -64,6 +64,8 @@
                { \
                        .entity weaponentity = weaponentities[wepslot]; \
                        W_NextWeaponOnImpulse(this, slot, weaponentity); \
+                       if(wepslot == 0 && autocvar_g_weaponswitch_debug != 1) \
+                               break; \
                } \
        }
 X(1)
@@ -96,6 +98,8 @@ X(0)
                { \
                        .entity weaponentity = weaponentities[wepslot]; \
                        W_CycleWeapon(this, this.cvar_cl_weaponpriorities[slot], dir, weaponentity); \
+                       if(wepslot == 0 && autocvar_g_weaponswitch_debug != 1) \
+                               break; \
                } \
        }
 X(0, prev)
@@ -147,6 +151,8 @@ X(9, next)
                { \
                        .entity weaponentity = weaponentities[slot]; \
                        W_SwitchWeapon(this, Weapons_from(WEP_FIRST + i), weaponentity); \
+                       if(slot == 0 && autocvar_g_weaponswitch_debug != 1) \
+                               break; \
                } \
        }
 X(0)
@@ -187,6 +193,9 @@ IMPULSE(weapon_next_byid)
        {
                .entity weaponentity = weaponentities[slot];
                W_NextWeapon(this, 0, weaponentity);
+
+               if(slot == 0 && autocvar_g_weaponswitch_debug != 1)
+                       break;
        }
 }
 
@@ -202,6 +211,9 @@ IMPULSE(weapon_prev_byid)
        {
                .entity weaponentity = weaponentities[slot];
                W_PreviousWeapon(this, 0, weaponentity);
+
+               if(slot == 0 && autocvar_g_weaponswitch_debug != 1)
+                       break;
        }
 }
 
@@ -217,6 +229,9 @@ IMPULSE(weapon_next_bygroup)
        {
                .entity weaponentity = weaponentities[slot];
                W_NextWeapon(this, 1, weaponentity);
+
+               if(slot == 0 && autocvar_g_weaponswitch_debug != 1)
+                       break;
        }
 }
 
@@ -232,6 +247,9 @@ IMPULSE(weapon_prev_bygroup)
        {
                .entity weaponentity = weaponentities[slot];
                W_PreviousWeapon(this, 1, weaponentity);
+
+               if(slot == 0 && autocvar_g_weaponswitch_debug != 1)
+                       break;
        }
 }
 
@@ -247,6 +265,9 @@ IMPULSE(weapon_next_bypriority)
        {
                .entity weaponentity = weaponentities[slot];
                W_NextWeapon(this, 2, weaponentity);
+
+               if(slot == 0 && autocvar_g_weaponswitch_debug != 1)
+                       break;
        }
 }
 
@@ -262,6 +283,9 @@ IMPULSE(weapon_prev_bypriority)
        {
                .entity weaponentity = weaponentities[slot];
                W_PreviousWeapon(this, 2, weaponentity);
+
+               if(slot == 0 && autocvar_g_weaponswitch_debug != 1)
+                       break;
        }
 }
 
@@ -273,6 +297,9 @@ IMPULSE(weapon_last)
        {
                .entity weaponentity = weaponentities[slot];
                W_LastWeapon(this, weaponentity);
+
+               if(slot == 0 && autocvar_g_weaponswitch_debug != 1)
+                       break;
        }
 }
 
@@ -284,6 +311,9 @@ IMPULSE(weapon_best)
        {
                .entity weaponentity = weaponentities[slot];
                W_SwitchWeapon(this, w_getbestweapon(this, weaponentity), weaponentity);
+
+               if(slot == 0 && autocvar_g_weaponswitch_debug != 1)
+                       break;
        }
 }
 
@@ -295,6 +325,9 @@ IMPULSE(weapon_drop)
        {
                .entity weaponentity = weaponentities[slot];
                W_ThrowWeapon(this, weaponentity, W_CalculateProjectileVelocity(this, this.velocity, v_forward * 750, false), '0 0 0', true);
+
+               if(slot == 0 && autocvar_g_weaponswitch_debug != 1)
+                       break;
        }
 }
 
@@ -309,12 +342,15 @@ IMPULSE(weapon_reload)
                .entity weaponentity = weaponentities[slot];
                Weapon w = this.(weaponentity).m_weapon;
                w.wr_reload(w, actor, weaponentity);
+
+               if(slot == 0 && autocvar_g_weaponswitch_debug != 1)
+                       break;
        }
 }
 
 void ImpulseCommands(entity this)
 {
-       if (gameover) return;
+       if (game_stopped) return;
 
        int imp = this.impulse;
        if (!imp) return;
@@ -515,6 +551,9 @@ IMPULSE(waypoint_clear_personal)
        {
                delete(this.personal);
                this.personal = NULL;
+
+               if((g_cts || g_race) && autocvar_g_allow_checkpoints)
+                       ClientKill(this);
        }
        sprint(this, "personal waypoint cleared\n");
 }
@@ -526,6 +565,8 @@ IMPULSE(waypoint_clear)
        {
                delete(this.personal);
                this.personal = NULL;
+               if((g_cts || g_race) && autocvar_g_allow_checkpoints)
+                       ClientKill(this);
        }
        sprint(this, "all waypoints cleared\n");
 }
@@ -543,6 +584,13 @@ IMPULSE(navwaypoint_remove)
        entity e = navigation_findnearestwaypoint(this, false);
        if (!e) return;
        if (e.wpflags & WAYPOINTFLAG_GENERATED) return;
+
+       if (e.wphardwired)
+       {
+               LOG_INFO("^1Warning: ^7Removal of hardwired waypoints is not allowed in the editor. Please remove links from/to this waypoint (", vtos(e.origin), ") by hand from maps/", mapname, ".waypoints.hardwired\n");
+               return;
+       }
+
        bprint(strcat("Waypoint removed at ", vtos(e.origin), "\n"));
        waypoint_remove(e);
 }
@@ -602,7 +650,7 @@ IMPULSE(navwaypoint_unreachable)
        IL_EACH(g_spawnpoints, true,
        {
                vector org = it.origin;
-               tracebox(it.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), it.origin - '0 0 512', MOVE_NOMONSTERS, NULL);
+               tracebox(it.origin, PL_MIN_CONST, PL_MAX_CONST, it.origin - '0 0 512', MOVE_NOMONSTERS, NULL);
                setorigin(it, trace_endpos);
                if (navigation_findnearestwaypoint(it, false))
                {