summaryrefslogtreecommitdiffstats
path: root/src/Generating
diff options
context:
space:
mode:
authortycho <tycho@localhost>2015-03-11 11:42:45 +0100
committertycho <tycho@localhost>2015-03-11 11:42:45 +0100
commit430cbb8c832af71d3a7200e6db80bf08681a7b26 (patch)
treea0828f51544f6494cc40475eeb6af41530054b8e /src/Generating
parentFixed style and removed false positives (diff)
downloadcuberite-430cbb8c832af71d3a7200e6db80bf08681a7b26.tar
cuberite-430cbb8c832af71d3a7200e6db80bf08681a7b26.tar.gz
cuberite-430cbb8c832af71d3a7200e6db80bf08681a7b26.tar.bz2
cuberite-430cbb8c832af71d3a7200e6db80bf08681a7b26.tar.lz
cuberite-430cbb8c832af71d3a7200e6db80bf08681a7b26.tar.xz
cuberite-430cbb8c832af71d3a7200e6db80bf08681a7b26.tar.zst
cuberite-430cbb8c832af71d3a7200e6db80bf08681a7b26.zip
Diffstat (limited to 'src/Generating')
-rw-r--r--src/Generating/BioGen.cpp28
-rw-r--r--src/Generating/IntGen.h2
2 files changed, 15 insertions, 15 deletions
diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index c9561cc09..9a7ba4d05 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -943,19 +943,19 @@ public:
auto FinalRivers =
std::make_shared<cIntGenChoice<2, 7>>(a_Seed + 12)
- >> MakeIntGen<cIntGenZoom <10>>(a_Seed + 11)
- >> MakeIntGen<cIntGenSmooth<8>>(a_Seed + 6)
- >> MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
- >> MakeIntGen<cIntGenZoom <8>>(a_Seed + 10)
- >> MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
- >> MakeIntGen<cIntGenZoom <8>>(a_Seed + 9)
- >> MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
- >> MakeIntGen<cIntGenZoom <8>>(a_Seed + 8)
- >> MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
- >> MakeIntGen<cIntGenZoom <9>>(a_Seed + 4)
- >> MakeIntGen<cIntGenRiver <7>>(a_Seed + 3)
- >> MakeIntGen<cIntGenZoom <10>>(a_Seed + 2)
- >> MakeIntGen<cIntGenSmooth<8>>(a_Seed + 1);
+ | MakeIntGen<cIntGenZoom <10>>(a_Seed + 11)
+ | MakeIntGen<cIntGenSmooth<8>>(a_Seed + 6)
+ | MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
+ | MakeIntGen<cIntGenZoom <8>>(a_Seed + 10)
+ | MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
+ | MakeIntGen<cIntGenZoom <8>>(a_Seed + 9)
+ | MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
+ | MakeIntGen<cIntGenZoom <8>>(a_Seed + 8)
+ | MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
+ | MakeIntGen<cIntGenZoom <9>>(a_Seed + 4)
+ | MakeIntGen<cIntGenRiver <7>>(a_Seed + 3)
+ | MakeIntGen<cIntGenZoom <10>>(a_Seed + 2)
+ | MakeIntGen<cIntGenSmooth<8>>(a_Seed + 1);
auto alteration =
std::make_shared<cIntGenZoom <8>>(a_Seed,
@@ -1001,7 +1001,7 @@ public:
std::make_shared<cIntGenAddIslands <6>> (a_Seed + 2000, 200,
std::make_shared<cIntGenSetRandomly <6>> (a_Seed + 9, 50, bgOcean,
std::make_shared<cIntGenLandOcean <5>> (a_Seed + 100, 30)
- >> MakeIntGen<cIntGenZoom <6>> (a_Seed + 10)
+ | MakeIntGen<cIntGenZoom <6>> (a_Seed + 10)
)))))))))))))))))))))))))))));
m_Gen =
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index fac500fa8..113c2de15 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -121,7 +121,7 @@ private:
};
template<class T, class RhsGen, class... Args>
-std::shared_ptr<RhsGen> operator>> (std::shared_ptr<T> lhs, cIntGenFactory<RhsGen, Args...> rhs)
+std::shared_ptr<RhsGen> operator| (std::shared_ptr<T> lhs, cIntGenFactory<RhsGen, Args...> rhs)
{
return rhs.construct(static_cast<std::shared_ptr<typename T::IntGenType>>(lhs));
}