From: terencehill Date: Thu, 22 Aug 2019 00:38:55 +0000 (+0200) Subject: Add parentheses X-Git-Tag: xonotic-v0.8.5~1356^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6171e1f68bdef7b2c484534d30ce99b25cb235b0;p=xonotic%2Fxonotic-data.pk3dir.git Add parentheses --- diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc index 6af003236..10bab67f0 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -964,7 +964,7 @@ void havocbot_movetogoal(entity this) vector flat_diff = vec2(diff); offset = max(32, current_speed * cos(deviation.y * DEG2RAD) * 0.3) * flatdir; vector actual_destorg = this.origin + offset; - if (this.goalcurrent_prev && this.goalcurrent_prev.wpflags & WAYPOINTFLAG_JUMP) + if (this.goalcurrent_prev && (this.goalcurrent_prev.wpflags & WAYPOINTFLAG_JUMP)) { if (time > this.bot_stop_moving_timeout && fabs(deviation.y) > 20 && current_speed > maxspeed * 0.4 @@ -983,7 +983,7 @@ void havocbot_movetogoal(entity this) navigation_goalrating_timeout_extend_if_needed(this, 1.5); } } - else if (!this.goalstack01 || this.goalcurrent.wpflags & (WAYPOINTFLAG_TELEPORT | WAYPOINTFLAG_LADDER)) + else if (!this.goalstack01 || (this.goalcurrent.wpflags & (WAYPOINTFLAG_TELEPORT | WAYPOINTFLAG_LADDER))) { if (vlen2(flat_diff) < vlen2(offset)) { @@ -1114,7 +1114,7 @@ void havocbot_movetogoal(entity this) s = CONTENT_SOLID; if (trace_fraction == 1 && !this.jumppadcount && !waypoint_is_hardwiredlink(this.goalcurrent_prev, this.goalcurrent) - && !(this.goalcurrent_prev && this.goalcurrent_prev.wpflags & WAYPOINTFLAG_JUMP) ) + && !(this.goalcurrent_prev && (this.goalcurrent_prev.wpflags & WAYPOINTFLAG_JUMP))) if((IS_ONGROUND(this)) || (this.aistatus & AI_STATUS_RUNNING) || (this.aistatus & AI_STATUS_ROAMING) || PHYS_INPUT_BUTTON_JUMP(this)) { // Look downwards diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc index 130d4dcca..c666fa94e 100644 --- a/qcsrc/server/bot/default/navigation.qc +++ b/qcsrc/server/bot/default/navigation.qc @@ -1582,7 +1582,7 @@ bool navigation_shortenpath(entity this) next = this.goalstack01; // if for some reason the bot is closer to the next goal, pop the current one - if (!IS_MOVABLE(next) && !this.goalcurrent.wpflags & (WAYPOINTFLAG_TELEPORT | WAYPOINTFLAG_JUMP) + if (!IS_MOVABLE(next) && !(this.goalcurrent.wpflags & (WAYPOINTFLAG_TELEPORT | WAYPOINTFLAG_JUMP)) && vlen2(this.goalcurrent.origin - next.origin) > vlen2(next.origin - this.origin) && checkpvs(this.origin + this.view_ofs, next)) { diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc index 24f6ba8cb..b282f258e 100644 --- a/qcsrc/server/bot/default/waypoints.qc +++ b/qcsrc/server/bot/default/waypoints.qc @@ -625,7 +625,7 @@ void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bo if (jp) { e = NULL; - IL_EACH(g_waypoints, it.wpflags & WPFLAGMASK_NORELINK + IL_EACH(g_waypoints, (it.wpflags & WPFLAGMASK_NORELINK) && boxesoverlap(org + PL_MIN_CONST, org + PL_MAX_CONST, it.absmin, it.absmax), { e = it; break; @@ -668,7 +668,7 @@ void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bo entity start_wp = NULL; if (start_wp_is_spawned) { - IL_EACH(g_waypoints, (start_wp_is_hardwired || it.wpflags & WPFLAGMASK_NORELINK) + IL_EACH(g_waypoints, (start_wp_is_hardwired || (it.wpflags & WPFLAGMASK_NORELINK)) && boxesoverlap(start_org, start_org, it.absmin, it.absmax), { start_wp = it; break; @@ -886,7 +886,7 @@ void waypoint_remove_fromeditor(entity pl) void waypoint_removelink(entity from, entity to) { - if (from == to || (from.wpflags & WPFLAGMASK_NORELINK && !(from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT)))) + if (from == to || ((from.wpflags & WPFLAGMASK_NORELINK) && !(from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT)))) return; entity fromwp31_prev = from.wp31; @@ -1015,7 +1015,7 @@ float waypoint_gettravelcost(vector from, vector to, entity from_ent, entity to_ if (submerged_from && submerged_to) return waypoint_getlinearcost_underwater(vlen(to - from)); - if (from_ent.wpflags & WAYPOINTFLAG_CROUCH && to_ent.wpflags & WAYPOINTFLAG_CROUCH) + if ((from_ent.wpflags & WAYPOINTFLAG_CROUCH) && (to_ent.wpflags & WAYPOINTFLAG_CROUCH)) return waypoint_getlinearcost_crouched(vlen(to - from)); float c = waypoint_getlinearcost(vlen(to - from)); @@ -1038,7 +1038,7 @@ float waypoint_gettravelcost(vector from, vector to, entity from_ent, entity to_ return (c + waypoint_getlinearcost_underwater(vlen(to - from))) / 2; // consider half path crouched - if (from_ent.wpflags & WAYPOINTFLAG_CROUCH || to_ent.wpflags & WAYPOINTFLAG_CROUCH) + if ((from_ent.wpflags & WAYPOINTFLAG_CROUCH) || (to_ent.wpflags & WAYPOINTFLAG_CROUCH)) return (c + waypoint_getlinearcost_crouched(vlen(to - from))) / 2; return c; @@ -1170,14 +1170,14 @@ void waypoint_think(entity this) vector m1 = PL_MIN_CONST; vector m2 = PL_MAX_CONST; - if (this.wpflags & WAYPOINTFLAG_CROUCH || it.wpflags & WAYPOINTFLAG_CROUCH) + if ((this.wpflags & WAYPOINTFLAG_CROUCH) || (it.wpflags & WAYPOINTFLAG_CROUCH)) { m1 = PL_CROUCH_MIN_CONST; m2 = PL_CROUCH_MAX_CONST; // links from crouch wp to normal wp (and viceversa) are very short to avoid creating many links // that would be wasted due to rough travel cost calculation (the longer link is, the higher cost is) // links from crouch wp to crouch wp can be as long as normal links - if (!(this.wpflags & WAYPOINTFLAG_CROUCH && it.wpflags & WAYPOINTFLAG_CROUCH)) + if (!((this.wpflags & WAYPOINTFLAG_CROUCH) && (it.wpflags & WAYPOINTFLAG_CROUCH))) maxdist = 100; } @@ -1191,7 +1191,7 @@ void waypoint_think(entity this) //traceline(this.origin, it.origin, false, NULL); //if (trace_fraction == 1) - if (this.wpisbox || this.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT) // forbid outgoing links + if (this.wpisbox || (this.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT)) // forbid outgoing links || it.SUPPORT_WP) // forbid incoming links { relink_walkculled += 0.5; @@ -1205,7 +1205,7 @@ void waypoint_think(entity this) } // reverse direction - if (it.wpisbox || it.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT) // forbid incoming links + if (it.wpisbox || (it.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT)) // forbid incoming links || this.SUPPORT_WP) // forbid outgoing links { relink_walkculled += 0.5; @@ -1541,7 +1541,7 @@ void waypoint_load_hardwiredlinks() waypoint_addlink(wp_from, wp_to); waypoint_mark_hardwiredlink(wp_from, wp_to); } else if (wp_from.wpflags & WPFLAGMASK_NORELINK - && (wp_from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT) + && ((wp_from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT)) || (wp_from.wpisbox && wp_from.wpflags & WAYPOINTFLAG_TELEPORT))) { waypoint_addlink(wp_from, wp_to); @@ -2027,7 +2027,7 @@ void waypoint_showlink(entity wp1, entity wp2, int display_type) if (!(wp1 && wp2)) return; - if (waypoint_is_hardwiredlink(wp1, wp2) || wp1.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT | WAYPOINTFLAG_CUSTOM_JP)) + if (waypoint_is_hardwiredlink(wp1, wp2) || (wp1.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT | WAYPOINTFLAG_CUSTOM_JP))) te_beam(NULL, wp1.origin, wp2.origin); else if (display_type == 1) te_lightning2(NULL, wp1.origin, wp2.origin);