Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix some warnings and other minor details
  • Loading branch information
kwolekr committed Sep 17, 2013
1 parent 9bccd75 commit c039822
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/main.cpp
Expand Up @@ -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")))
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/map.cpp
Expand Up @@ -2827,7 +2827,7 @@ MapBlock* ServerMap::finishBlockMake(BlockMakeData *data,
<<blockpos_requested.Z<<")"<<std::endl;*/

/*
Update weather data in central blocks if needed
Update weather data in blocks
*/
ServerEnvironment *senv = &((Server *)m_gamedef)->getEnv();
if (senv->m_use_weather) {
Expand Down
2 changes: 1 addition & 1 deletion src/script/lua_api/l_mapgen.cpp
Expand Up @@ -484,7 +484,7 @@ int ModApiMapgen::l_create_schematic(lua_State *L)
v3s16 pos = read_v3s16(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));
}

Expand Down
2 changes: 1 addition & 1 deletion src/server.cpp
Expand Up @@ -4645,7 +4645,7 @@ void Server::DenyAccess(u16 peer_id, const std::wstring &reason)
client->denied = true;

// 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 "
<<"peer_id="<<peer_id<<" immediately"<<std::endl;
// Delete peer to stop sending it data
Expand Down

0 comments on commit c039822

Please sign in to comment.