edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 06:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1949 from ChillerDragon/master

Browse source 
Remove space xd
This commit is contained in:
oy 2019-01-05 18:30:41 +01:00 committed by GitHub
parent 7fd1b06295 22289be1b9
commit 8931034c37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bam.lua
View file

@ -120,7 +120,7 @@ function GenerateMacOSXSettings(settings, conf, arch, compiler)
os.exit(1) os.exit(1)
end end
-- c++ stdlib needed -- c++ stdlib needed
settings.cc.flags:Add("--stdlib=libc++") settings.cc.flags:Add("--stdlib=libc++")
settings.link.flags:Add("--stdlib=libc++") settings.link.flags:Add("--stdlib=libc++")
-- this also needs the macOS min SDK version to be at least 10.7 -- this also needs the macOS min SDK version to be at least 10.7

4
datasrc/editor/desert_main.rules
View file

@ -21,7 +21,7 @@ Random 150
Index 16 Index 16
Pos 0 -1 EMPTY Pos 0 -1 EMPTY
#right #right
Index 17 Index 17
Pos 1 0 EMPTY Pos 1 0 EMPTY
@ -170,7 +170,7 @@ Random 500
Index 96 Index 96
Pos 0 -1 EMPTY Pos 0 -1 EMPTY
#right #right
Index 97 Index 97
Pos 1 0 EMPTY Pos 1 0 EMPTY

4
datasrc/editor/jungle_main.rules
View file

@ -33,7 +33,7 @@ Index 98
Pos 0 -1 EMPTY Pos 0 -1 EMPTY
Random 15 Random 15
#right #right
Index 21 Index 21
Pos 1 0 EMPTY Pos 1 0 EMPTY
@ -209,7 +209,7 @@ Random 150
Index 26 Index 26
Pos 0 -1 EMPTY Pos 0 -1 EMPTY
#right #right
Index 25 Index 25
Pos 1 0 EMPTY Pos 1 0 EMPTY

2
other/teeworlds.appdata.xml
View file

@ -8,7 +8,7 @@
<p> <p>
Teeworlds is a free online multiplayer game. Battle with up to 16 players Teeworlds is a free online multiplayer game. Battle with up to 16 players
in a variety of game modes, including Team Deathmatch and Capture The Flag. in a variety of game modes, including Team Deathmatch and Capture The Flag.
You can even design your own maps! You can even design your own maps!
</p> </p>
</description> </description>
<url type="homepage">https://www.teeworlds.com/</url> <url type="homepage">https://www.teeworlds.com/</url>

4
scripts/refactor_count.py
View file

@ -31,10 +31,10 @@ allowed_words += [ # system.h
"str_comp_num", "str_find_nocase", "str_sanitize_strong", "str_uppercase", "str_toint", "str_tofloat", "str_comp_num", "str_find_nocase", "str_sanitize_strong", "str_uppercase", "str_toint", "str_tofloat",
"str_utf8_encode", "str_utf8_rewind", "str_utf8_forward", "str_utf8_decode", "str_sanitize_cc", "str_skip_whitespaces", "str_utf8_encode", "str_utf8_rewind", "str_utf8_forward", "str_utf8_decode", "str_sanitize_cc", "str_skip_whitespaces",
"fs_makedir", "fs_listdir", "fs_storage_path", "fs_is_dir", "fs_makedir", "fs_listdir", "fs_storage_path", "fs_is_dir",
"net_init", "net_addr_comp", "net_host_lookup", "net_addr_str", "type", "port", "net_addr_from_str", "net_init", "net_addr_comp", "net_host_lookup", "net_addr_str", "type", "port", "net_addr_from_str",
"net_udp_create", "net_udp_send", "net_udp_recv", "net_udp_close", "net_socket_read_wait", "net_udp_create", "net_udp_send", "net_udp_recv", "net_udp_close", "net_socket_read_wait",
"net_stats", "sent_bytes", "recv_bytes", "recv_packets", "sent_packets", "net_stats", "sent_bytes", "recv_bytes", "recv_packets", "sent_packets",
"time_get", "time_freq", "time_timestamp"] "time_get", "time_freq", "time_timestamp"]
allowed_words += ["vec2", "vec3", "vec4", "round", "clamp", "length", "dot", "normalize", "frandom", "mix", "distance", "min", allowed_words += ["vec2", "vec3", "vec4", "round", "clamp", "length", "dot", "normalize", "frandom", "mix", "distance", "min",
"closest_point_on_line", "max", "absolute"] # math.hpp "closest_point_on_line", "max", "absolute"] # math.hpp

2
src/base/system.c
View file

@ -1836,7 +1836,7 @@ char* str_sanitize_filename(char* aName)
while(*str) while(*str)
{ {
// replace forbidden characters with a whispace // replace forbidden characters with a whispace
if(*str == '/' || *str == '<' || *str == '>' || *str == ':' || *str == '"' if(*str == '/' || *str == '<' || *str == '>' || *str == ':' || *str == '"'
|| *str == '/' || *str == '\\' || *str == '|' || *str == '?' || *str == '*') || *str == '/' || *str == '\\' || *str == '|' || *str == '?' || *str == '*')
*str = ' '; *str = ' ';
str++; str++;

2
src/base/system.h
View file

@ -849,7 +849,7 @@ void str_sanitize(char *str);
/* /*
Function: str_sanitize_filename Function: str_sanitize_filename
Replaces all forbidden Windows/Unix characters with whitespace Replaces all forbidden Windows/Unix characters with whitespace
or nothing if leading or trailing. or nothing if leading or trailing.
Parameters: Parameters:

2
src/engine/client/serverbrowser.h
View file

@ -45,7 +45,7 @@ public:
void RemoveFavorite(const CServerInfo *pEntry); void RemoveFavorite(const CServerInfo *pEntry);
int AddFilter(const CServerFilterInfo *pFilterInfo) { return m_ServerBrowserFilter.AddFilter(pFilterInfo); }; int AddFilter(const CServerFilterInfo *pFilterInfo) { return m_ServerBrowserFilter.AddFilter(pFilterInfo); };
void SetFilter(int Index, const CServerFilterInfo *pFilterInfo) { m_ServerBrowserFilter.SetFilter(Index, pFilterInfo); }; void SetFilter(int Index, const CServerFilterInfo *pFilterInfo) { m_ServerBrowserFilter.SetFilter(Index, pFilterInfo); };
void GetFilter(int Index, CServerFilterInfo *pFilterInfo) { m_ServerBrowserFilter.GetFilter(Index, pFilterInfo); }; void GetFilter(int Index, CServerFilterInfo *pFilterInfo) { m_ServerBrowserFilter.GetFilter(Index, pFilterInfo); };
void RemoveFilter(int Index) { m_ServerBrowserFilter.RemoveFilter(Index); }; void RemoveFilter(int Index) { m_ServerBrowserFilter.RemoveFilter(Index); };

2
src/engine/client/serverbrowser_fav.cpp
View file

@ -139,7 +139,7 @@ bool CServerBrowserFavorites::RemoveFavoriteEx(const char *pHostname, const NETA
} }
else if(pFavEntry->m_State <= FAVSTATE_LOOKUPCHECK && m_FavLookup.m_FavoriteIndex == Index) else if(pFavEntry->m_State <= FAVSTATE_LOOKUPCHECK && m_FavLookup.m_FavoriteIndex == Index)
{ {
// skip result on favorite hostname lookup // skip result on favorite hostname lookup
m_FavLookup.m_FavoriteIndex = -1; m_FavLookup.m_FavoriteIndex = -1;
} }

2
src/engine/shared/network_token.cpp
View file

@ -254,7 +254,7 @@ TOKEN CNetTokenCache::GetToken(const NETADDR *pAddr)
void CNetTokenCache::FetchToken(const NETADDR *pAddr) void CNetTokenCache::FetchToken(const NETADDR *pAddr)
{ {
CNetBase::SendControlMsgWithToken(m_Socket, pAddr, NET_TOKEN_NONE, 0, CNetBase::SendControlMsgWithToken(m_Socket, pAddr, NET_TOKEN_NONE, 0,
NET_CTRLMSG_TOKEN, m_pTokenManager->GenerateToken(pAddr), true); NET_CTRLMSG_TOKEN, m_pTokenManager->GenerateToken(pAddr), true);
} }

2
src/game/client/components/binds.cpp
View file

@ -57,7 +57,7 @@ int CBinds::GetModifierMask(IInput *i)
Mask |= i->KeyIsPressed(KEY_LCTRL) << CBinds::MODIFIER_CTRL; Mask |= i->KeyIsPressed(KEY_LCTRL) << CBinds::MODIFIER_CTRL;
Mask |= i->KeyIsPressed(KEY_RCTRL) << CBinds::MODIFIER_CTRL; Mask |= i->KeyIsPressed(KEY_RCTRL) << CBinds::MODIFIER_CTRL;
Mask |= i->KeyIsPressed(KEY_LALT) << CBinds::MODIFIER_ALT; Mask |= i->KeyIsPressed(KEY_LALT) << CBinds::MODIFIER_ALT;
if(Mask == 0) if(Mask == 0)
return 1; // if no modifier, flag with MODIFIER_NONE return 1; // if no modifier, flag with MODIFIER_NONE
return Mask; return Mask;
} }

6
src/game/client/components/menus_browser.cpp
View file

@ -257,7 +257,7 @@ void CMenus::SaveFilters()
if(i == 0) if(i == 0)
p = "\n"; p = "\n";
else else
p = ",\n"; p = ",\n";
io_write(File, p, str_length(p)); io_write(File, p, str_length(p));
str_format(aBuf, sizeof(aBuf), "\t{\"%s\": {\n", m_lFilters[i].Name()); str_format(aBuf, sizeof(aBuf), "\t{\"%s\": {\n", m_lFilters[i].Name());
@ -1032,7 +1032,7 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
int NumFilters = m_lFilters.size(); int NumFilters = m_lFilters.size();
float ListHeight = NumServers * ms_ListheaderHeight; // add server list height float ListHeight = NumServers * ms_ListheaderHeight; // add server list height
ListHeight += NumFilters * SpacingH; // add filters ListHeight += NumFilters * SpacingH; // add filters
ListHeight += (NumFilters) * ButtonHeight;// add filters spacing ListHeight += (NumFilters) * ButtonHeight;// add filters spacing
if(!m_SidebarActive && m_SelectedServer.m_Index != -1 && SelectedFilter != -1 && m_ShowServerDetails) if(!m_SidebarActive && m_SelectedServer.m_Index != -1 && SelectedFilter != -1 && m_ShowServerDetails)
ListHeight += ms_ListheaderHeight*5; ListHeight += ms_ListheaderHeight*5;
@ -1841,7 +1841,7 @@ void CMenus::RenderDetailInfo(CUIRect View, const CServerInfo *pInfo)
if(pInfo) if(pInfo)
{ {
CUIRect Row; CUIRect Row;
// Localize("Map"); Localize("Game type"); Localize("Version"); Localize("Casual"); Localize("Normal"); Localize("Difficulty"); Localize("Competitive"); // Localize("Map"); Localize("Game type"); Localize("Version"); Localize("Casual"); Localize("Normal"); Localize("Difficulty"); Localize("Competitive");
static CLocConstString s_aLabels[] = { static CLocConstString s_aLabels[] = {
"Map", "Map",
"Game type", "Game type",

2
src/game/client/components/menus_ingame.cpp
View file

@ -442,7 +442,7 @@ void CMenus::RenderServerInfo(CUIRect MainView)
GameInfo.HSplitTop(ButtonHeight, &Label, &GameInfo); GameInfo.HSplitTop(ButtonHeight, &Label, &GameInfo);
Label.y += 2.0f; Label.y += 2.0f;
str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Difficulty"), (CurrentServerInfo.m_ServerLevel == 0) ? Localize("Casual") : str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Difficulty"), (CurrentServerInfo.m_ServerLevel == 0) ? Localize("Casual") :
(CurrentServerInfo.m_ServerLevel == 1 ? Localize("Normal") : Localize("Competitive"))); (CurrentServerInfo.m_ServerLevel == 1 ? Localize("Normal") : Localize("Competitive")));
UI()->DoLabel(&Label, aBuf, ButtonHeight*ms_FontmodHeight*0.8f, CUI::ALIGN_LEFT); UI()->DoLabel(&Label, aBuf, ButtonHeight*ms_FontmodHeight*0.8f, CUI::ALIGN_LEFT);

2
src/game/client/components/scoreboard.h
View file

@ -39,7 +39,7 @@ public:
bool Active(); bool Active();
void ResetPlayerStats(int ClientID); void ResetPlayerStats(int ClientID);
class CUIRect GetScoreboardRect(); class CUIRect GetScoreboardRect();
}; };
#endif #endif

4
src/game/server/gamemodes/lms.cpp
View file

@ -36,7 +36,7 @@ void CGameControllerLMS::DoWincheckRound()
for(int i = 0; i < MAX_CLIENTS; ++i) for(int i = 0; i < MAX_CLIENTS; ++i)
{ {
if(GameServer()->m_apPlayers[i] && GameServer()->m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS && if(GameServer()->m_apPlayers[i] && GameServer()->m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS &&
(!GameServer()->m_apPlayers[i]->m_RespawnDisabled || (!GameServer()->m_apPlayers[i]->m_RespawnDisabled ||
(GameServer()->m_apPlayers[i]->GetCharacter() && GameServer()->m_apPlayers[i]->GetCharacter()->IsAlive()))) (GameServer()->m_apPlayers[i]->GetCharacter() && GameServer()->m_apPlayers[i]->GetCharacter()->IsAlive())))
GameServer()->m_apPlayers[i]->m_Score++; GameServer()->m_apPlayers[i]->m_Score++;
} }
@ -51,7 +51,7 @@ void CGameControllerLMS::DoWincheckRound()
for(int i = 0; i < MAX_CLIENTS; ++i) for(int i = 0; i < MAX_CLIENTS; ++i)
{ {
if(GameServer()->m_apPlayers[i] && GameServer()->m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS && if(GameServer()->m_apPlayers[i] && GameServer()->m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS &&
(!GameServer()->m_apPlayers[i]->m_RespawnDisabled || (!GameServer()->m_apPlayers[i]->m_RespawnDisabled ||
(GameServer()->m_apPlayers[i]->GetCharacter() && GameServer()->m_apPlayers[i]->GetCharacter()->IsAlive()))) (GameServer()->m_apPlayers[i]->GetCharacter() && GameServer()->m_apPlayers[i]->GetCharacter()->IsAlive())))
{ {
++AlivePlayerCount; ++AlivePlayerCount;

2
src/game/server/gamemodes/lts.cpp
View file

@ -20,7 +20,7 @@ void CGameControllerLTS::DoWincheckRound()
for(int i = 0; i < MAX_CLIENTS; ++i) for(int i = 0; i < MAX_CLIENTS; ++i)
{ {
if(GameServer()->m_apPlayers[i] && GameServer()->m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS && if(GameServer()->m_apPlayers[i] && GameServer()->m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS &&
(!GameServer()->m_apPlayers[i]->m_RespawnDisabled || (!GameServer()->m_apPlayers[i]->m_RespawnDisabled ||
(GameServer()->m_apPlayers[i]->GetCharacter() && GameServer()->m_apPlayers[i]->GetCharacter()->IsAlive()))) (GameServer()->m_apPlayers[i]->GetCharacter() && GameServer()->m_apPlayers[i]->GetCharacter()->IsAlive())))
++Count[GameServer()->m_apPlayers[i]->GetTeam()]; ++Count[GameServer()->m_apPlayers[i]->GetTeam()];
} }