Skip to content

Commit c039822

Browse files
committed
Fix some warnings and other minor details
1 parent 9bccd75 commit c039822

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1473,8 +1473,8 @@ int main(int argc, char *argv[])
14731473
gui::IGUISkin* skin = guienv->getSkin();
14741474
std::string font_path = g_settings->get("font_path");
14751475
gui::IGUIFont *font;
1476-
bool use_freetype = g_settings->getBool("freetype");
14771476
#if USE_FREETYPE
1477+
bool use_freetype = g_settings->getBool("freetype");
14781478
if (use_freetype) {
14791479
std::string fallback;
14801480
if (is_yes(gettext("needs_fallback_font")))
@@ -1686,7 +1686,7 @@ int main(int argc, char *argv[])
16861686
g_settings->set("port", itos(port));
16871687

16881688
if((menudata.selected_world >= 0) &&
1689-
(menudata.selected_world < worldspecs.size()))
1689+
(menudata.selected_world < (int)worldspecs.size()))
16901690
g_settings->set("selected_world_path",
16911691
worldspecs[menudata.selected_world].path);
16921692

@@ -1718,7 +1718,7 @@ int main(int argc, char *argv[])
17181718

17191719
// Set world path to selected one
17201720
if ((menudata.selected_world >= 0) &&
1721-
(menudata.selected_world < worldspecs.size())) {
1721+
(menudata.selected_world < (int)worldspecs.size())) {
17221722
worldspec = worldspecs[menudata.selected_world];
17231723
infostream<<"Selected world: "<<worldspec.name
17241724
<<" ["<<worldspec.path<<"]"<<std::endl;

src/map.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2827,7 +2827,7 @@ MapBlock* ServerMap::finishBlockMake(BlockMakeData *data,
28272827
<<blockpos_requested.Z<<")"<<std::endl;*/
28282828

28292829
/*
2830-
Update weather data in central blocks if needed
2830+
Update weather data in blocks
28312831
*/
28322832
ServerEnvironment *senv = &((Server *)m_gamedef)->getEnv();
28332833
if (senv->m_use_weather) {

src/script/lua_api/l_mapgen.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ int ModApiMapgen::l_create_schematic(lua_State *L)
484484
v3s16 pos = read_v3s16(L, -1);
485485
lua_pop(L, 1);
486486

487-
u8 prob = getintfield_default(L, -1, "prob", 0xFF);
487+
u8 prob = getintfield_default(L, -1, "prob", MTSCHEM_PROB_ALWAYS);
488488
probability_list.push_back(std::make_pair(pos, prob));
489489
}
490490

src/server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4645,7 +4645,7 @@ void Server::DenyAccess(u16 peer_id, const std::wstring &reason)
46454645
client->denied = true;
46464646

46474647
// If there are way too many clients, get rid of denied new ones immediately
4648-
if(m_clients.size() > 2 * g_settings->getU16("max_users")){
4648+
if((int)m_clients.size() > 2 * g_settings->getU16("max_users")){
46494649
verbosestream<<"Server: DenyAccess: Too many clients; getting rid of "
46504650
<<"peer_id="<<peer_id<<" immediately"<<std::endl;
46514651
// Delete peer to stop sending it data

0 commit comments

Comments
 (0)