mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-07-06 18:28:07 +00:00
Merge pull request #259 from TheComputerGuy96/fix/biomesource-override
FixedBiomeSource: Make sure BiomeSource functions get overriden
This commit is contained in:
@@ -200,7 +200,7 @@ TilePos* FixedBiomeSource::findBiome(int x, int z, int r, Biome* toFind,
|
||||
* @brief Finds a biome from a list of allowed biomes randomly.
|
||||
*/
|
||||
TilePos* FixedBiomeSource::findBiome(int x, int z, int r,
|
||||
const std::vector<Biome*>& allowed,
|
||||
const std::vector<Biome*> allowed,
|
||||
Random* random) {
|
||||
if (find(allowed.begin(), allowed.end(), biome) != allowed.end()) {
|
||||
return new TilePos(x - r + random->nextInt(r * 2 + 1), 0,
|
||||
@@ -220,6 +220,6 @@ bool FixedBiomeSource::containsOnly(int x, int z, int r, Biome* allowed) {
|
||||
* @brief Checks if the fixed biome is in the allowed list.
|
||||
*/
|
||||
bool FixedBiomeSource::containsOnly(int x, int z, int r,
|
||||
const std::vector<Biome*>& allowed) {
|
||||
const std::vector<Biome*> allowed) {
|
||||
return find(allowed.begin(), allowed.end(), biome) != allowed.end();
|
||||
}
|
||||
|
||||
@@ -36,10 +36,10 @@ class FixedBiomeSource : public BiomeSource {
|
||||
virtual TilePos* findBiome(int x, int z, int r, Biome* toFind,
|
||||
Random* random);
|
||||
virtual TilePos* findBiome(int x, int z, int r,
|
||||
const std::vector<Biome*>& allowed,
|
||||
const std::vector<Biome*> allowed,
|
||||
Random* random);
|
||||
virtual bool containsOnly(int x, int z, int r, Biome* allowed);
|
||||
virtual bool containsOnly(
|
||||
int x, int z, int r,
|
||||
const std::vector<Biome*>& allowed);
|
||||
const std::vector<Biome*> allowed);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user