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 eb54a98e9ef5daa7a22ab183af99dc5d3594a1ea..a7f9554294fc40ad246505743f4721a6b194b199 100644 (file)
--- a/qcsrc/server/impulse.qc
+++ b/qcsrc/server/impulse.qc
@@ -52,8 +52,6 @@
 
 // weapon switching impulses
 
 
 // weapon switching impulses
 

-bool autocvar_g_weaponswitch_debug;
-

 #define X(slot) \
        IMPULSE(weapon_group_##slot) \
        { \
 #define X(slot) \
        IMPULSE(weapon_group_##slot) \
        { \


@@ -553,6 +551,9 @@ IMPULSE(waypoint_clear_personal)
        {
                delete(this.personal);
                this.personal = NULL;
        {
                delete(this.personal);
                this.personal = NULL;

+
+               if((g_cts || g_race) && autocvar_g_allow_checkpoints)
+                       ClientKill(this);

        }
        sprint(this, "personal waypoint cleared\n");
 }
        }
        sprint(this, "personal waypoint cleared\n");
 }


@@ -564,6 +565,8 @@ IMPULSE(waypoint_clear)
        {
                delete(this.personal);
                this.personal = NULL;
        {
                delete(this.personal);
                this.personal = NULL;

+               if((g_cts || g_race) && autocvar_g_allow_checkpoints)
+                       ClientKill(this);

        }
        sprint(this, "all waypoints cleared\n");
 }
        }
        sprint(this, "all waypoints cleared\n");
 }


@@ -581,6 +584,13 @@ IMPULSE(navwaypoint_remove)
        entity e = navigation_findnearestwaypoint(this, false);
        if (!e) return;
        if (e.wpflags & WAYPOINTFLAG_GENERATED) return;
        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);
 }
        bprint(strcat("Waypoint removed at ", vtos(e.origin), "\n"));
        waypoint_remove(e);
 }