flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

FIxed a couple more warnings

Browse Source
This commit is contained in:
Tycho 2014-09-08 19:15:29 +01:00
parent 2c945c8818
commit fb20c2eb85
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/World.cpp
View File

@ -757,6 +757,11 @@ void cWorld::InitialiseGeneratorDefaults(cIniFile & a_IniFile)
a_IniFile.GetValueSet("Generator", "BottomLavaHeight", "30"); a_IniFile.GetValueSet("Generator", "BottomLavaHeight", "30");
break; break;
} }
case dimNotSet:
{
assert(!"Dimension not set");
break;
}
} }
} }
@ -772,6 +777,7 @@ void cWorld::InitialiseAndLoadMobSpawningValues(cIniFile & a_IniFile)
case dimOverworld: DefaultMonsters = "bat, cavespider, chicken, cow, creeper, enderman, horse, mooshroom, ocelot, pig, sheep, silverfish, skeleton, slime, spider, squid, wolf, zombie"; break; case dimOverworld: DefaultMonsters = "bat, cavespider, chicken, cow, creeper, enderman, horse, mooshroom, ocelot, pig, sheep, silverfish, skeleton, slime, spider, squid, wolf, zombie"; break;
case dimNether: DefaultMonsters = "blaze, ghast, magmacube, skeleton, zombie, zombiepigman"; break; case dimNether: DefaultMonsters = "blaze, ghast, magmacube, skeleton, zombie, zombiepigman"; break;
case dimEnd: DefaultMonsters = "enderman"; break; case dimEnd: DefaultMonsters = "enderman"; break;
case dimNotSet: assert(!"Dimension not set"); break;
} }
m_bAnimals = a_IniFile.GetValueSetB("Monsters", "AnimalsOn", true); m_bAnimals = a_IniFile.GetValueSetB("Monsters", "AnimalsOn", true);
@ -1130,7 +1136,7 @@ void cWorld::UpdateSkyDarkness(void)
} }
else if (TempTime <= TIME_NIGHT_START) else if (TempTime <= TIME_NIGHT_START)
{ {
m_SkyDarkness = (TIME_NIGHT_START - TempTime) / TIME_SPAWN_DIVISOR; m_SkyDarkness = static_cast<NIBBLETYPE>((TIME_NIGHT_START - TempTime) / TIME_SPAWN_DIVISOR);
} }
else if (TempTime <= TIME_NIGHT_END) else if (TempTime <= TIME_NIGHT_END)
{ {
@ -1138,7 +1144,7 @@ void cWorld::UpdateSkyDarkness(void)
} }
else else
{ {
m_SkyDarkness = (TIME_SUNRISE - TempTime) / TIME_SPAWN_DIVISOR; m_SkyDarkness = static_cast<NIBBLETYPE>((TIME_SUNRISE - TempTime) / TIME_SPAWN_DIVISOR);
} }
} }