From c0398224ef60b73067351d3e8f7a6e0d1ff7df72 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Mon, 16 Sep 2013 23:52:42 -0400 Subject: Fix some warnings and other minor details --- src/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main.cpp') 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: "<