Merge pull request #1949 from ChillerDragon/master

Remove space xd

bam.lua

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

datasrc/editor/desert_main.rules

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

datasrc/editor/jungle_main.rules

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

other/teeworlds.appdata.xml

@@ -8,7 +8,7 @@
     <p>
       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.
-      You can even design your own maps! 
+      You can even design your own maps!
     </p>
   </description>
   <url type="homepage">https://www.teeworlds.com/</url>

scripts/refactor_count.py

@@ -31,10 +31,10 @@ allowed_words += [ # system.h
 	"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",
 	"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_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",
         "closest_point_on_line", "max", "absolute"] # math.hpp

src/base/system.c

@@ -1836,7 +1836,7 @@ char* str_sanitize_filename(char* aName)
 	while(*str)
 	{
 		// 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++;

src/base/system.h

@@ -849,7 +849,7 @@ void str_sanitize(char *str);
 
 /*
 	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.
 
 	Parameters:

src/engine/client/serverbrowser.h

@@ -45,7 +45,7 @@ public:
 	void RemoveFavorite(const CServerInfo *pEntry);
 
 	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 RemoveFilter(int Index) { m_ServerBrowserFilter.RemoveFilter(Index); };
 

src/engine/client/serverbrowser_fav.cpp

@@ -139,7 +139,7 @@ bool CServerBrowserFavorites::RemoveFavoriteEx(const char *pHostname, const NETA
 		}
 		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;
 		}
 		

src/engine/shared/network_token.cpp

@@ -254,7 +254,7 @@ TOKEN CNetTokenCache::GetToken(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);
 }
 

src/game/client/components/binds.cpp

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

src/game/client/components/menus_browser.cpp

@@ -257,7 +257,7 @@ void CMenus::SaveFilters()
 		if(i == 0)
 			p = "\n";
 		else
-			p = ",\n"; 
+			p = ",\n";
 		io_write(File, p, str_length(p));
 
 		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();
 	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
 	if(!m_SidebarActive && m_SelectedServer.m_Index != -1 && SelectedFilter != -1 && m_ShowServerDetails)
 		ListHeight += ms_ListheaderHeight*5;
@@ -1841,7 +1841,7 @@ void CMenus::RenderDetailInfo(CUIRect View, const CServerInfo *pInfo)
 	if(pInfo)
 	{
 		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[] = {
 			"Map",		
 			"Game type",

src/game/client/components/menus_ingame.cpp

@@ -442,7 +442,7 @@ void CMenus::RenderServerInfo(CUIRect MainView)
 
 	GameInfo.HSplitTop(ButtonHeight, &Label, &GameInfo);
 	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")));
 	UI()->DoLabel(&Label, aBuf, ButtonHeight*ms_FontmodHeight*0.8f, CUI::ALIGN_LEFT);
 

src/game/client/components/scoreboard.h

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

src/game/server/gamemodes/lms.cpp

@@ -36,7 +36,7 @@ void CGameControllerLMS::DoWincheckRound()
 		for(int i = 0; i < MAX_CLIENTS; ++i)
 		{
 			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]->m_Score++;
 		}
@@ -51,7 +51,7 @@ void CGameControllerLMS::DoWincheckRound()
 		for(int i = 0; i < MAX_CLIENTS; ++i)
 		{
 			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())))
 			{
 				++AlivePlayerCount;

src/game/server/gamemodes/lts.cpp

@@ -20,7 +20,7 @@ void CGameControllerLTS::DoWincheckRound()
 	for(int i = 0; i < MAX_CLIENTS; ++i)
 	{
 		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())))
 			++Count[GameServer()->m_apPlayers[i]->GetTeam()];
 	}