oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-05 18:41:05 +00:00
Code Wiki Activity

Fix Whitespace pr check issues

Browse source
This commit is contained in:
DustyBagel 2024-09-27 21:41:33 -05:00
parent 327049e8e9
commit 0e110c311e
3 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/network/lan.cpp
View file

@ -163,16 +163,12 @@ void lan_adv::send_string(const std::string &str)
addr.sin_port = htons(adv_port); addr.sin_port = htons(adv_port);
UDPSocket socket_send(false); UDPSocket socket_send(false);
// Full discloser, the use of inet_proto and the mreq stucture
// were suggested by ai.
inet_pton(AF_INET, adv_multicast_addr, &(addr.sin_addr)); inet_pton(AF_INET, adv_multicast_addr, &(addr.sin_addr));
struct ip_mreq mreq; struct ip_mreq mreq;
mreq.imr_multiaddr.s_addr = inet_addr(adv_multicast_addr); mreq.imr_multiaddr.s_addr = inet_addr(adv_multicast_addr);
mreq.imr_interface.s_addr = htonl(INADDR_ANY); mreq.imr_interface.s_addr = htonl(INADDR_ANY);
setsockopt(socket_send.GetHandle(), IPPROTO_IP, IP_ADD_MEMBERSHIP, setsockopt(socket_send.GetHandle(), IPPROTO_IP, IP_ADD_MEMBERSHIP,
(const char *)&mreq, sizeof(mreq)); (const char *)&mreq, sizeof(mreq));
@ -191,7 +187,7 @@ void lan_adv::serve(unsigned short port)
{ {
server_port = port; server_port = port;
stop(); stop();
start(); start();
} }
void *lan_adv::run() void *lan_adv::run()

2
src/script/lua_api/l_mainmenu.cpp
View file

@ -1120,7 +1120,7 @@ int ModApiMainMenu::l_get_lan_servers(lua_State *L)
lua_pushstring(L, field_name.c_str()); lua_pushstring(L, field_name.c_str());
if (server.second[field_name].isString()) if (server.second[field_name].isString())
lua_pushstring(L, server.second[field_name].asCString()); lua_pushstring(L, server.second[field_name].asCString());
else if (server.second[field_name].isConvertibleTo(Json::realValue)) else if (server.second[field_name].isConvertibleTo(Json::realValue))
lua_pushnumber(L, server.second[field_name].asDouble()); lua_pushnumber(L, server.second[field_name].asDouble());
else else
lua_pushnil(L); lua_pushnil(L);

2
src/server.cpp
View file

@ -420,7 +420,7 @@ Server::~Server()
// Wait until the lan_adv_server thread has finished. // Wait until the lan_adv_server thread has finished.
// This is so that its thread destructor doesn't kill the thread // This is so that its thread destructor doesn't kill the thread
// before it sends the 'shutdown' command to remove this server's // before it sends the 'shutdown' command to remove this server's
// server info from the serverlist of local clients. // server info from the serverlist of local clients.
} }
} }
} }