diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-12-29 14:12:40 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-12-29 14:12:40 +0000 |
| commit | 048f18e2a0b32044525cef41fa053984433c74b9 (patch) | |
| tree | dfa4a11169654924c55a4dbfb0de3863e1f33342 /game/network/network.cpp | |
| parent | Remove weird operator! on vec2/3 (diff) | |
| download | ilt-048f18e2a0b32044525cef41fa053984433c74b9.tar.bz2 ilt-048f18e2a0b32044525cef41fa053984433c74b9.tar.xz ilt-048f18e2a0b32044525cef41fa053984433c74b9.zip | |
Remove misleading power operator^ on vec2/3
Diffstat (limited to 'game/network/network.cpp')
| -rw-r--r-- | game/network/network.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/game/network/network.cpp b/game/network/network.cpp index 5de2f5d..1ff5b26 100644 --- a/game/network/network.cpp +++ b/game/network/network.cpp @@ -125,7 +125,7 @@ Network::genCurveDef(const Position3D & start, const Position3D & end, float sta const auto c1 = flatStart + sincosf(startDir + half_pi) * radius; const auto c2 = flatEnd + sincosf(endDir + half_pi) * radius; const auto mid = (c1 + c2) / 2.F; - const auto midh = mid ^ midheight(mid); + const auto midh = mid || midheight(mid); return {{start, midh, c1}, {end, midh, c2}}; } else { @@ -133,7 +133,7 @@ Network::genCurveDef(const Position3D & start, const Position3D & end, float sta const auto c1 = flatStart + sincosf(startDir - half_pi) * radius; const auto c2 = flatEnd + sincosf(endDir - half_pi) * radius; const auto mid = (c1 + c2) / 2.F; - const auto midh = mid ^ midheight(mid); + const auto midh = mid || midheight(mid); return {{midh, start, c1}, {midh, end, c2}}; } } |