luanti-org · Feb 3, 2017
diff --git a/‎builtin/mainmenu/common.lua
+20-1 b/‎builtin/mainmenu/common.lua
+20-1
diff --git a/‎builtin/mainmenu/tab_multiplayer.lua
+1 b/‎builtin/mainmenu/tab_multiplayer.lua
+1
diff --git a/‎builtin/mainmenu/tab_simple_main.lua
+1 b/‎builtin/mainmenu/tab_simple_main.lua
+1
diff --git a/‎src/script/lua_api/l_mainmenu.cpp
+7 b/‎src/script/lua_api/l_mainmenu.cpp
+7
diff --git a/‎textures/base/pack/server_ping_1.png
251 Bytes b/‎textures/base/pack/server_ping_1.png
251 Bytes
diff --git a/‎textures/base/pack/server_ping_2.png
244 Bytes b/‎textures/base/pack/server_ping_2.png
244 Bytes
diff --git a/‎textures/base/pack/server_ping_3.png
245 Bytes b/‎textures/base/pack/server_ping_3.png
245 Bytes
diff --git a/‎textures/base/pack/server_ping_4.png
213 Bytes b/‎textures/base/pack/server_ping_4.png
213 Bytes
@@ -54,7 +54,11 @@ end
 function image_column(tooltip, flagname)
 	return "image,tooltip=" .. core.formspec_escape(tooltip) .. "," ..
 		"0=" .. core.formspec_escape(defaulttexturedir .. "blank.png") .. "," ..
-		"1=" .. core.formspec_escape(defaulttexturedir .. "server_flags_" .. flagname .. ".png")
+		"1=" .. core.formspec_escape(defaulttexturedir .. "server_flags_" .. flagname .. ".png") .. "," ..
+		"2=" .. core.formspec_escape(defaulttexturedir .. "server_ping_4.png") .. "," ..
+		"3=" .. core.formspec_escape(defaulttexturedir .. "server_ping_3.png") .. "," ..
+		"4=" .. core.formspec_escape(defaulttexturedir .. "server_ping_2.png") .. "," ..
+		"5=" .. core.formspec_escape(defaulttexturedir .. "server_ping_1.png")
 end
 
 --------------------------------------------------------------------------------
@@ -97,6 +101,21 @@ function render_serverlist_row(spec, is_favorite)
 		details = "0,"
 	end
 
+	if spec.ping then
+		local ping = spec.ping * 1000
+		if ping <= 50 then
+			details = details .. "2,"
+		elseif ping <= 100 then
+			details = details .. "3,"
+		elseif ping <= 250 then
+			details = details .. "4,"
+		else
+			details = details .. "5,"
+		end
+	else
+		details = details .. "0,"
+	end
+
 	if spec.clients and spec.clients_max then
 		local clients_color = ''
 		local clients_percent = 100 * spec.clients / spec.clients_max
 
@@ -69,6 +69,7 @@ local function get_formspec(tabview, name, tabdata)
 	--favourites
 	retval = retval .. "tablecolumns[" ..
 		image_column(fgettext("Favorite"), "favorite") .. ";" ..
+		image_column(fgettext("Ping"), "") .. ",padding=0.25;" ..
 		"color,span=3;" ..
 		"text,align=right;" ..                -- clients
 		"text,align=center,padding=0.25;" ..  -- "/"
 
@@ -43,6 +43,7 @@ local function get_formspec(tabview, name, tabdata)
 
 	retval = retval .. "tablecolumns[" ..
 		image_column(fgettext("Favorite"), "favorite") .. ";" ..
+		image_column(fgettext("Ping"), "") .. ",padding=0.25;" ..
 		"color,span=3;" ..
 		"text,align=right;" ..                -- clients
 		"text,align=center,padding=0.25;" ..  -- "/"
 
@@ -577,6 +577,13 @@ int ModApiMainMenu::l_get_favorites(lua_State *L)
 			lua_settable(L, top_lvl2);
 		}
 
+		if (servers[i].isMember("ping")) {
+			float ping = servers[i]["ping"].asFloat();
+			lua_pushstring(L, "ping");
+			lua_pushnumber(L, ping);
+			lua_settable(L, top_lvl2);
+		}
+
 		lua_settable(L, top);
 		index++;
 	}
Original file line number	Diff line number	Diff line change
`@@ -577,6 +577,13 @@ int ModApiMainMenu::l_get_favorites(lua_State *L)`
`577`	`577`	`lua_settable(L, top_lvl2);`
`578`	`578`	`}`
`579`	`579`
	`580`	`+ if (servers[i].isMember("ping")) {`
	`581`	`+ float ping = servers[i]["ping"].asFloat();`
	`582`	`+ lua_pushstring(L, "ping");`
	`583`	`+ lua_pushnumber(L, ping);`
	`584`	`+ lua_settable(L, top_lvl2);`
	`585`	`+ }`
	`586`	`+`
`580`	`587`	`lua_settable(L, top);`
`581`	`588`	`index++;`
`582`	`589`	`}`