Calinou
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some warnings and other minor details

master
kwolekr 2013-09-16 23:52:42 -04:00
parent 9bccd75e34
commit c0398224ef
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.cpp
View File

@ -1473,8 +1473,8 @@ int main(int argc, char *argv[])
gui::IGUISkin* skin = guienv->getSkin(); gui::IGUISkin* skin = guienv->getSkin();
std::string font_path = g_settings->get("font_path"); std::string font_path = g_settings->get("font_path");
gui::IGUIFont *font; gui::IGUIFont *font;
bool use_freetype = g_settings->getBool("freetype");
#if USE_FREETYPE #if USE_FREETYPE
bool use_freetype = g_settings->getBool("freetype");
if (use_freetype) { if (use_freetype) {
std::string fallback; std::string fallback;
if (is_yes(gettext("needs_fallback_font"))) if (is_yes(gettext("needs_fallback_font")))
@ -1686,7 +1686,7 @@ int main(int argc, char *argv[])
g_settings->set("port", itos(port)); g_settings->set("port", itos(port));
if((menudata.selected_world >= 0) && if((menudata.selected_world >= 0) &&
(menudata.selected_world < worldspecs.size())) (menudata.selected_world < (int)worldspecs.size()))
g_settings->set("selected_world_path", g_settings->set("selected_world_path",
worldspecs[menudata.selected_world].path); worldspecs[menudata.selected_world].path);
@ -1718,7 +1718,7 @@ int main(int argc, char *argv[])
// Set world path to selected one // Set world path to selected one
if ((menudata.selected_world >= 0) && if ((menudata.selected_world >= 0) &&
(menudata.selected_world < worldspecs.size())) { (menudata.selected_world < (int)worldspecs.size())) {
worldspec = worldspecs[menudata.selected_world]; worldspec = worldspecs[menudata.selected_world];
infostream<<"Selected world: "<<worldspec.name infostream<<"Selected world: "<<worldspec.name
<<" ["<<worldspec.path<<"]"<<std::endl; <<" ["<<worldspec.path<<"]"<<std::endl;

2
src/map.cpp
View File

@ -2827,7 +2827,7 @@ MapBlock* ServerMap::finishBlockMake(BlockMakeData *data,
<<blockpos_requested.Z<<")"<<std::endl;*/ <<blockpos_requested.Z<<")"<<std::endl;*/
/* /*
Update weather data in central blocks if needed Update weather data in blocks
*/ */
ServerEnvironment *senv = &((Server *)m_gamedef)->getEnv(); ServerEnvironment *senv = &((Server *)m_gamedef)->getEnv();
if (senv->m_use_weather) { if (senv->m_use_weather) {

2
src/script/lua_api/l_mapgen.cpp
View File

@ -484,7 +484,7 @@ int ModApiMapgen::l_create_schematic(lua_State *L)
v3s16 pos = read_v3s16(L, -1); v3s16 pos = read_v3s16(L, -1);
lua_pop(L, 1); lua_pop(L, 1);
u8 prob = getintfield_default(L, -1, "prob", 0xFF); u8 prob = getintfield_default(L, -1, "prob", MTSCHEM_PROB_ALWAYS);
probability_list.push_back(std::make_pair(pos, prob)); probability_list.push_back(std::make_pair(pos, prob));
} }

2
src/server.cpp
View File

@ -4645,7 +4645,7 @@ void Server::DenyAccess(u16 peer_id, const std::wstring &reason)
client->denied = true; client->denied = true;
// If there are way too many clients, get rid of denied new ones immediately // If there are way too many clients, get rid of denied new ones immediately
if(m_clients.size() > 2 * g_settings->getU16("max_users")){ if((int)m_clients.size() > 2 * g_settings->getU16("max_users")){
verbosestream<<"Server: DenyAccess: Too many clients; getting rid of " verbosestream<<"Server: DenyAccess: Too many clients; getting rid of "
<<"peer_id="<<peer_id<<" immediately"<<std::endl; <<"peer_id="<<peer_id<<" immediately"<<std::endl;
// Delete peer to stop sending it data // Delete peer to stop sending it data