summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-03-03 20:55:04 +0100
committermadmaxoft <github@xoft.cz>2014-03-03 20:55:04 +0100
commit442c1d96fc77a91b917c7a7aefb7f8f23c0a7e10 (patch)
tree0b825d6f1d85da97199fc8c5eb12d5b7addf6d13 /src
parentMerge pull request #746 from Howaner/Slabs (diff)
downloadcuberite-442c1d96fc77a91b917c7a7aefb7f8f23c0a7e10.tar
cuberite-442c1d96fc77a91b917c7a7aefb7f8f23c0a7e10.tar.gz
cuberite-442c1d96fc77a91b917c7a7aefb7f8f23c0a7e10.tar.bz2
cuberite-442c1d96fc77a91b917c7a7aefb7f8f23c0a7e10.tar.lz
cuberite-442c1d96fc77a91b917c7a7aefb7f8f23c0a7e10.tar.xz
cuberite-442c1d96fc77a91b917c7a7aefb7f8f23c0a7e10.tar.zst
cuberite-442c1d96fc77a91b917c7a7aefb7f8f23c0a7e10.zip
Diffstat (limited to '')
-rw-r--r--src/World.cpp6
-rw-r--r--src/World.h3
2 files changed, 5 insertions, 4 deletions
diff --git a/src/World.cpp b/src/World.cpp
index 58d50d3a8..6ee0def91 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -325,8 +325,8 @@ int cWorld::GetDefaultWeatherInterval(eWeather a_Weather)
}
default:
{
- LOGWARNING("Missing default weather interval for weather %d.", a_Weather);
- return 1200;
+ LOGWARNING("%s: Missing default weather interval for weather %d.", __FUNCTION__, a_Weather);
+ return -1;
}
} // switch (Weather)
}
@@ -348,7 +348,7 @@ void cWorld::SetWeather(eWeather a_NewWeather)
m_WeatherInterval = GetDefaultWeatherInterval(a_NewWeather);
// The weather can't be found:
- if (m_WeatherInterval == 1200)
+ if (m_WeatherInterval < 0)
{
return;
}
diff --git a/src/World.h b/src/World.h
index 27f1482e5..93397c014 100644
--- a/src/World.h
+++ b/src/World.h
@@ -139,7 +139,8 @@ public:
BroadcastTimeUpdate();
}
- /** Returns the default weather interval for the specific weather type */
+ /** Returns the default weather interval for the specific weather type.
+ Returns -1 for any unknown weather. */
int GetDefaultWeatherInterval(eWeather a_Weather);
/** Returns the current game mode. Partly OBSOLETE, you should use IsGameModeXXX() functions wherever applicable */