]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix compilation broken by the previous merge commit
authorterencehill <piuntn@gmail.com>
Mon, 15 Jan 2018 17:25:42 +0000 (18:25 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 15 Jan 2018 17:25:42 +0000 (18:25 +0100)
qcsrc/server/bot/default/navigation.qc
qcsrc/server/mutators/mutator/gamemode_race.qc

index 3754897bda3fe5ff2554409d318933ad3e11e38a..e491a327dc6754890471f2dbd2a16fe8cbde5565 100644 (file)
@@ -1598,7 +1598,7 @@ int navigation_poptouchedgoals(entity this)
                        if (this.jumppadcount && !boxesoverlap(this.goalcurrent.absmin, this.goalcurrent.absmax,
                                this.lastteleport_origin + STAT(PL_MIN, this), this.lastteleport_origin + STAT(PL_MAX, this)))
                        {
-                               return;
+                               return removed_goals;
                        }
 
                        if(this.aistatus & AI_STATUS_WAYPOINT_PERSONAL_GOING)
index 690d23ca8bc3e2595df612f403185eba0975ee9c..aa6d12a83e063166da288364d0314e521d3c9970 100644 (file)
@@ -36,6 +36,7 @@ void havocbot_role_race(entity this)
                                        goto search_racecheckpoints;
                                }
                                navigation_routerating(this, it, 1000000, 5000);
+                       }
                });
 
                navigation_goalrating_end(this);