aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2013-09-16 23:52:42 -0400
committerkwolekr <kwolekr@minetest.net>2013-09-16 23:52:42 -0400
commitc0398224ef60b73067351d3e8f7a6e0d1ff7df72 (patch)
tree3f1432db70b8b3ef001f289b07deaca8430e050b /src/main.cpp
parent9bccd75e340d7502251c233418e0afccd9c4a49c (diff)
downloadhax-minetest-server-c0398224ef60b73067351d3e8f7a6e0d1ff7df72.tar.gz
hax-minetest-server-c0398224ef60b73067351d3e8f7a6e0d1ff7df72.zip
Fix some warnings and other minor details
Diffstat (limited to '')
-rw-r--r--src/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index dfe1e5c97..f34e24abc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1473,8 +1473,8 @@ int main(int argc, char *argv[])
gui::IGUISkin* skin = guienv->getSkin();
std::string font_path = g_settings->get("font_path");
gui::IGUIFont *font;
- bool use_freetype = g_settings->getBool("freetype");
#if USE_FREETYPE
+ bool use_freetype = g_settings->getBool("freetype");
if (use_freetype) {
std::string fallback;
if (is_yes(gettext("needs_fallback_font")))
@@ -1686,7 +1686,7 @@ int main(int argc, char *argv[])
g_settings->set("port", itos(port));
if((menudata.selected_world >= 0) &&
- (menudata.selected_world < worldspecs.size()))
+ (menudata.selected_world < (int)worldspecs.size()))
g_settings->set("selected_world_path",
worldspecs[menudata.selected_world].path);
@@ -1718,7 +1718,7 @@ int main(int argc, char *argv[])
// Set world path to selected one
if ((menudata.selected_world >= 0) &&
- (menudata.selected_world < worldspecs.size())) {
+ (menudata.selected_world < (int)worldspecs.size())) {
worldspec = worldspecs[menudata.selected_world];
infostream<<"Selected world: "<<worldspec.name
<<" ["<<worldspec.path<<"]"<<std::endl;