summaryrefslogtreecommitdiff
path: root/src/biome.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/biome.cpp')
-rw-r--r--src/biome.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/biome.cpp b/src/biome.cpp
index 07dad1f23..80b8d8f4f 100644
--- a/src/biome.cpp
+++ b/src/biome.cpp
@@ -78,7 +78,7 @@ BiomeDefManager::BiomeDefManager(IGameDef *gamedef) {
BiomeDefManager::~BiomeDefManager() {
- for (int i = 0; i != bgroups.size(); i++)
+ for (unsigned int i = 0; i != bgroups.size(); i++)
delete bgroups[i];
}
@@ -96,6 +96,7 @@ Biome *BiomeDefManager::createBiome(BiomeTerrainType btt) {
case BIOME_TERRAIN_FLAT:
return new BiomeSuperflat;
}
+ return NULL;
}
@@ -116,7 +117,7 @@ void BiomeDefManager::addBiomeGroup(float freq) {
void BiomeDefManager::addBiome(Biome *b) {
std::vector<Biome *> *bgroup;
- if (b->groupid >= bgroups.size()) {
+ if ((unsigned int)b->groupid >= bgroups.size()) {
errorstream << "BiomeDefManager: attempted to add biome '" << b->name
<< "' to nonexistent biome group " << b->groupid << std::endl;
return;
@@ -131,7 +132,6 @@ void BiomeDefManager::addBiome(Biome *b) {
void BiomeDefManager::addDefaultBiomes() {
- std::vector<Biome *> *bgroup;
Biome *b;
b = new Biome;