350 changes: 157 additions & 193 deletions src/game/server/score/sql_score.cpp
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/game/variables.h
View file
Expand Up @@ -36,6 +36,7 @@ MACRO_CONFIG_INT(ClShowKillMessages, cl_showkillmessages, 1, 0, 1, CFGFLAG_CLIEN
MACRO_CONFIG_INT(ClShowVotesAfterVoting, cl_show_votes_after_voting, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show votes window after voting")
MACRO_CONFIG_INT(ClShowLocalTimeAlways, cl_show_local_time_always, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Always show local time")
MACRO_CONFIG_INT(ClShowfps, cl_showfps, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show ingame FPS counter")
MACRO_CONFIG_INT(ClShowpred, cl_showpred, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show ingame prediction time in milliseconds")
MACRO_CONFIG_INT(ClEyeWheel, cl_eye_wheel, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show eye wheel along together with emotes")
MACRO_CONFIG_INT(ClEyeDuration, cl_eye_duration, 999999, 1, 999999, CFGFLAG_CLIENT|CFGFLAG_SAVE, "How long the eyes emotes last")

Expand Down Expand Up @@ -70,7 +71,6 @@ MACRO_CONFIG_INT(EdShowkeys, ed_showkeys, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE,
MACRO_CONFIG_INT(ClShowWelcome, cl_show_welcome, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "")
MACRO_CONFIG_INT(ClMotdTime, cl_motd_time, 10, 0, 100, CFGFLAG_CLIENT|CFGFLAG_SAVE, "How long to show the server message of the day")

MACRO_CONFIG_STR(ClVersionServer, cl_version_server, 100, "version.teeworlds.com", CFGFLAG_CLIENT|CFGFLAG_SAVE, "Server to use to check for new versions")
MACRO_CONFIG_STR(ClDDNetVersionServer, cl_ddnet_version_server, 100, "version.ddnet.tw", CFGFLAG_CLIENT|CFGFLAG_SAVE, "Server to use to check for new ddnet versions")
MACRO_CONFIG_STR(ClDDNetUpdate2Server, cl_ddnet_update2_server, 100, "update2.ddnet.tw", CFGFLAG_CLIENT|CFGFLAG_SAVE, "Server to use to update new ddnet versions")
MACRO_CONFIG_STR(ClDDNetMapServer, cl_ddnet_maps_server, 100, "maps.ddnet.tw", CFGFLAG_CLIENT|CFGFLAG_SAVE, "Server to use to download maps")
Expand Down Expand Up @@ -149,7 +149,7 @@ MACRO_CONFIG_INT(SvVoteSpectateRejoindelay, sv_vote_spectate_rejoindelay, 3, 0,
MACRO_CONFIG_INT(SvVoteKick, sv_vote_kick, 1, 0, 1, CFGFLAG_SERVER, "Allow voting to kick players")
MACRO_CONFIG_INT(SvVoteKickMin, sv_vote_kick_min, 0, 0, MAX_CLIENTS, CFGFLAG_SERVER, "Minimum number of players required to start a kick vote")
MACRO_CONFIG_INT(SvVoteKickBantime, sv_vote_kick_bantime, 5, 0, 1440, CFGFLAG_SERVER, "The time in seconds to ban a player if kicked by vote. 0 makes it just use kick")
MACRO_CONFIG_INT(SvJoinVoteDelay, sv_join_vote_delay, 1, 0, 1, CFGFLAG_SERVER, "Add a delay before recently joined players can vote")
MACRO_CONFIG_INT(SvJoinVoteDelay, sv_join_vote_delay, 60, 0, 1000, CFGFLAG_SERVER, "Add a delay before recently joined players can vote (in seconds)")
MACRO_CONFIG_INT(SvOldTeleportWeapons, sv_old_teleport_weapons, 0, 0, 1, CFGFLAG_SERVER|CFGFLAG_GAME, "Teleporting of all weapons (deprecated, use special entities instead)");
MACRO_CONFIG_INT(SvOldTeleportHook, sv_old_teleport_hook, 0, 0, 1, CFGFLAG_SERVER|CFGFLAG_GAME, "Hook through teleporter (deprecated, use special entities instead)");
MACRO_CONFIG_INT(SvTeleportHoldHook, sv_teleport_hold_hook, 0, 0, 1, CFGFLAG_SERVER|CFGFLAG_GAME, "Hold hook when teleported");
Expand Down
6 changes: 3 additions & 3 deletions src/game/version.h
View file
Expand Up @@ -3,8 +3,8 @@
#ifndef GAME_VERSION_H
#define GAME_VERSION_H
#include "generated/nethash.cpp"
#define GAME_VERSION "0.6.3, 10.0"
#define GAME_VERSION "0.6.3, 10.1.1"
#define GAME_NETVERSION "0.6 626fce9a778df4d4"
static const char GAME_RELEASE_VERSION[8] = "10.0";
#define CLIENT_VERSIONNR 1000
static const char GAME_RELEASE_VERSION[8] = "10.1.1";
#define CLIENT_VERSIONNR 1001
#endif
8 changes: 4 additions & 4 deletions src/mastersrv/mastersrv.cpp
View file
Expand Up @@ -162,7 +162,7 @@ void BuildPackets()
{
*pCurrent = m_aServers[m_NumServers-1];
m_NumServers--;
dbg_msg("mastersrv", "error: server of invalid type, dropping it");
dbg_msg("mastersrv", "ERROR: server of invalid type, dropping it");
}
}
}
Expand Down Expand Up @@ -208,7 +208,7 @@ void AddCheckserver(NETADDR *pInfo, NETADDR *pAlt, ServerType Type)
// add server
if(m_NumCheckServers == MAX_SERVERS)
{
dbg_msg("mastersrv", "error: mastersrv is full");
dbg_msg("mastersrv", "ERROR: mastersrv is full");
return;
}

Expand Down Expand Up @@ -243,7 +243,7 @@ void AddServer(NETADDR *pInfo, ServerType Type)
// add server
if(m_NumServers == MAX_SERVERS)
{
dbg_msg("mastersrv", "error: mastersrv is full");
dbg_msg("mastersrv", "ERROR: mastersrv is full");
return;
}

Expand Down Expand Up @@ -314,7 +314,7 @@ void PurgeServers()
void ReloadBans()
{
m_NetBan.UnbanAll();
m_pConsole->ExecuteFile("master.cfg");
m_pConsole->ExecuteFile("master.cfg", -1, true);
}

int main(int argc, const char **argv) // ignore_convention
Expand Down
2 changes: 1 addition & 1 deletion src/tools/config_common.h
View file
Expand Up @@ -7,7 +7,7 @@ int main(int argc, const char **argv)
IStorage *pStorage = CreateLocalStorage();
if(argc == 1)
{
dbg_msg("Usage", "%s FILE1 [ FILE2... ]", argv[0]);
dbg_msg("usage", "%s FILE1 [ FILE2... ]", argv[0]);
return -1;
}
for(int i = 1; i < argc; i++)
Expand Down
2 changes: 1 addition & 1 deletion src/tools/dilate.cpp
View file
Expand Up @@ -93,7 +93,7 @@ int main(int argc, const char **argv)
dbg_logger_stdout();
if(argc == 1)
{
dbg_msg("Usage", "%s FILE1 [ FILE2... ]", argv[0]);
dbg_msg("usage", "%s FILE1 [ FILE2... ]", argv[0]);
return -1;
}

Expand Down
2 changes: 1 addition & 1 deletion src/tools/tileset_borderadd.cpp
View file
Expand Up @@ -76,7 +76,7 @@ int main(int argc, const char **argv)
dbg_logger_stdout();
if(argc == 1)
{
dbg_msg("Usage", "%s FILE1 [ FILE2... ]", argv[0]);
dbg_msg("usage", "%s FILE1 [ FILE2... ]", argv[0]);
return -1;
}

Expand Down
2 changes: 1 addition & 1 deletion src/tools/tileset_borderfix.cpp
View file
Expand Up @@ -88,7 +88,7 @@ int main(int argc, const char **argv)
dbg_logger_stdout();
if(argc == 1)
{
dbg_msg("Usage", "%s FILE1 [ FILE2... ]", argv[0]);
dbg_msg("usage", "%s FILE1 [ FILE2... ]", argv[0]);
return -1;
}

Expand Down
2 changes: 1 addition & 1 deletion src/tools/tileset_borderrem.cpp
View file
Expand Up @@ -76,7 +76,7 @@ int main(int argc, const char **argv)
dbg_logger_stdout();
if(argc == 1)
{
dbg_msg("Usage", "%s FILE1 [ FILE2... ]", argv[0]);
dbg_msg("usage", "%s FILE1 [ FILE2... ]", argv[0]);
return -1;
}

Expand Down
2 changes: 1 addition & 1 deletion src/tools/tileset_borderset.cpp
View file
Expand Up @@ -68,7 +68,7 @@ int main(int argc, const char **argv)
dbg_logger_stdout();
if(argc == 1)
{
dbg_msg("Usage", "%s FILE1 [ FILE2... ]", argv[0]);
dbg_msg("usage", "%s FILE1 [ FILE2... ]", argv[0]);
return -1;
}

Expand Down
4 changes: 1 addition & 3 deletions src/versionsrv/versionsrv.cpp
View file
Expand Up @@ -196,9 +196,7 @@ int main(int argc, char **argv) // ignore_convention

char aAddrStr[NETADDR_MAXSTRSIZE];
net_addr_str(&Packet.m_Address, aAddrStr, sizeof(aAddrStr), false);
char aBuf[128];
str_format(aBuf, sizeof(aBuf), "version request by %s", aAddrStr);
dbg_msg("versionsrv", aBuf);
dbg_msg("versionsrv", "version request by %s", aAddrStr);
}

if(Packet.m_DataSize == sizeof(VERSIONSRV_GETNEWS) &&
Expand Down