AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 11:35:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix crashing when loading some .cw maps with custom fog colour

Browse Source
This commit is contained in:
UnknownShadow200 2019-03-09 19:59:04 +11:00
parent 2a59444f71
commit f20de966cb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Formats.c
View File

@ -550,13 +550,13 @@ static void Cw_Callback_4(struct NbtTag* tag) {
if (IsTag(tag, "Distance")) { p->ReachDistance = NbtTag_U16(tag) / 32.0f; return; } if (IsTag(tag, "Distance")) { p->ReachDistance = NbtTag_U16(tag) / 32.0f; return; }
} }
if (IsTag(tag->Parent, "EnvWeatherType")) { if (IsTag(tag->Parent, "EnvWeatherType")) {
if (IsTag(tag, "WeatherType")) { Env_SetWeather(NbtTag_U8(tag)); return; } if (IsTag(tag, "WeatherType")) { Env_Weather = NbtTag_U8(tag); return; }
} }
if (IsTag(tag->Parent, "EnvMapAppearance")) { if (IsTag(tag->Parent, "EnvMapAppearance")) {
if (IsTag(tag, "SideBlock")) { Env_SetSidesBlock(NbtTag_U8(tag)); return; } if (IsTag(tag, "SideBlock")) { Env_SidesBlock = NbtTag_U8(tag); return; }
if (IsTag(tag, "EdgeBlock")) { Env_SetEdgeBlock(NbtTag_U8(tag)); return; } if (IsTag(tag, "EdgeBlock")) { Env_EdgeBlock = NbtTag_U8(tag); return; }
if (IsTag(tag, "SideLevel")) { Env_SetEdgeHeight(NbtTag_I16(tag)); return; } if (IsTag(tag, "SideLevel")) { Env_EdgeHeight = NbtTag_I16(tag); return; }
if (IsTag(tag, "TextureURL")) { if (IsTag(tag, "TextureURL")) {
String url = NbtTag_String(tag); String url = NbtTag_String(tag);
@ -570,11 +570,11 @@ static void Cw_Callback_4(struct NbtTag* tag) {
/* Callback for compound tag is called after all its children have been processed */ /* Callback for compound tag is called after all its children have been processed */
if (IsTag(tag->Parent, "EnvColors")) { if (IsTag(tag->Parent, "EnvColors")) {
if (IsTag(tag, "Sky")) { if (IsTag(tag, "Sky")) {
Env_SetSkyCol(Cw_ParseCol(Env_DefaultSkyCol)); return; Env_SkyCol = Cw_ParseCol(Env_DefaultSkyCol); return;
} else if (IsTag(tag, "Cloud")) { } else if (IsTag(tag, "Cloud")) {
Env_SetCloudsCol(Cw_ParseCol(Env_DefaultCloudsCol)); return; Env_CloudsCol = Cw_ParseCol(Env_DefaultCloudsCol); return;
} else if (IsTag(tag, "Fog")) { } else if (IsTag(tag, "Fog")) {
Env_SetFogCol(Cw_ParseCol(Env_DefaultFogCol)); return; Env_FogCol = Cw_ParseCol(Env_DefaultFogCol); return;
} else if (IsTag(tag, "Sunlight")) { } else if (IsTag(tag, "Sunlight")) {
Env_SetSunCol(Cw_ParseCol(Env_DefaultSunCol)); return; Env_SetSunCol(Cw_ParseCol(Env_DefaultSunCol)); return;
} else if (IsTag(tag, "Ambient")) { } else if (IsTag(tag, "Ambient")) {