mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 01:24:18 +00:00
commited the small thing that I had before I reinstall my machine
This commit is contained in:
parent
3e14fc3b2c
commit
a7cb36877c
10
default.bam
10
default.bam
|
@ -25,16 +25,6 @@ function rc(output, input)
|
|||
return os.execute("rc /fo " .. output .. " " .. input)
|
||||
end
|
||||
|
||||
function cmd5(output, inputs)
|
||||
print("cmd5 " .. PathFilename(output))
|
||||
cmd = cmd5_tool .. " "
|
||||
for i,v in inputs do
|
||||
cmd = cmd .. v .. " "
|
||||
end
|
||||
cmd = cmd .. " > " .. output
|
||||
return os.execute(cmd)
|
||||
end
|
||||
|
||||
function cmd5(output, inputs)
|
||||
cmd = cmd5_tool .. " "
|
||||
for i,v in inputs do
|
||||
|
|
|
@ -3,7 +3,7 @@ from socket import *
|
|||
import struct
|
||||
import sys
|
||||
|
||||
def tw_get_server_info(address, port):
|
||||
def get_server_info(address, port):
|
||||
try:
|
||||
sock = socket(AF_INET, SOCK_DGRAM)
|
||||
sock.settimeout(1.5);
|
||||
|
@ -39,7 +39,7 @@ def tw_get_server_info(address, port):
|
|||
except:
|
||||
return None
|
||||
|
||||
def tw_get_server_count(address, port):
|
||||
def get_server_count(address, port):
|
||||
try:
|
||||
sock = socket(AF_INET, SOCK_DGRAM)
|
||||
sock.settimeout(1.5);
|
||||
|
@ -52,7 +52,7 @@ def tw_get_server_count(address, port):
|
|||
except:
|
||||
return -1
|
||||
|
||||
def tw_get_servers(address):
|
||||
def get_servers(address):
|
||||
counter = 0
|
||||
master_port = 8300
|
||||
servers = []
|
||||
|
@ -78,23 +78,21 @@ def tw_get_servers(address):
|
|||
return None
|
||||
|
||||
|
||||
#tw_get_server_info("10.0.0.2", 8303)
|
||||
|
||||
#sys.exit(-1)
|
||||
|
||||
servers = []
|
||||
for i in range(1, 16):
|
||||
def get_all_servers():
|
||||
servers = []
|
||||
for i in range(1, 16):
|
||||
addr = "master%d.teeworlds.com"%i
|
||||
list = tw_get_servers(addr)
|
||||
list = get_servers(addr)
|
||||
if list:
|
||||
print "%s had %d servers" % (addr, len(list))
|
||||
servers += list
|
||||
return servers
|
||||
|
||||
servers = get_all_servers()
|
||||
total_players = 0
|
||||
for server in servers:
|
||||
print "checking server", server[0], server[1]
|
||||
info = tw_get_server_info(server[0], server[1])
|
||||
info = get_server_info(server[0], server[1])
|
||||
if info:
|
||||
total_players += len(info["players"])
|
||||
|
||||
print total_players
|
||||
print total_players, "on", len(servers), 'servers'
|
||||
|
|
|
@ -902,7 +902,7 @@ void render_game()
|
|||
server_motd_time = 0;
|
||||
else if (chat_mode)
|
||||
chat_mode = CHATMODE_NONE;
|
||||
else
|
||||
else if(!console_active())
|
||||
{
|
||||
menu_active = !menu_active;
|
||||
if(menu_active)
|
||||
|
|
Loading…
Reference in a new issue