Fix dummy disconnecting on hot reload

scripts/android/files/AndroidManifest.xml

@@ -1,40 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	android:installLocation="auto">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 	<!-- Vulkan 1.1.0 is used if supported -->
 	<uses-feature
 		android:name="android.hardware.vulkan.version"
 		android:required="false"
 		android:version="0x00401000" />
 	<!-- android:glEsVersion is not specified as OpenGL ES 1.0 is supported as fallback -->
-
-	<!-- Only playable in landscape mode -->
 	<uses-feature
 		android:name="android.hardware.screen.landscape"
 		android:required="true" />
 
-	<!-- Touchscreen support -->
-	<uses-feature
-		android:name="android.hardware.touchscreen"
-		android:required="false" />
-
-	<!-- Game controller support -->
-	<uses-feature
-		android:name="android.hardware.bluetooth"
-		android:required="false" />
-	<uses-feature
-		android:name="android.hardware.gamepad"
-		android:required="false" />
-	<uses-feature
-		android:name="android.hardware.usb.host"
-		android:required="false" />
-
-	<!-- External mouse input events -->
-	<uses-feature
-		android:name="android.hardware.type.pc"
-		android:required="false" />
-
 	<!-- Teeworlds does broadcasts over local networks -->
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 	<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
@@ -50,24 +25,17 @@
 		android:isGame="true"
 		android:icon="@mipmap/ic_launcher"
 		android:roundIcon="@mipmap/ic_launcher_round"
-		android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-		android:hardwareAccelerated="true">
+		android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
 		<activity
 			android:name="org.ddnet.client.NativeMain"
-			android:alwaysRetainTaskState="true"
 			android:exported="true"
-			android:configChanges="layoutDirection|locale|orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
-			android:preferMinimalPostProcessing="true"
+			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:screenOrientation="landscape"
 			android:launchMode="singleInstance">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
-			<!-- Let Android know that we can handle some USB devices and should receive this event -->
-			<intent-filter>
-				<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
-			</intent-filter>
 			<meta-data
 				android:name="android.app.lib_name"
 				android:value="DDNet" />

src/engine/client.h

@@ -163,7 +163,7 @@ public:
 
 	// dummy
 	virtual void DummyDisconnect(const char *pReason) = 0;
-	virtual void DummyConnect(bool Force = false) = 0;
+	virtual void DummyConnect() = 0;
 	virtual bool DummyConnected() const = 0;
 	virtual bool DummyConnecting() const = 0;
 	virtual bool DummyConnectingDelayed() const = 0;

src/engine/client/client.cpp

@@ -668,7 +668,10 @@ void CClient::DisconnectWithReason(const char *pReason)
 	m_CurrentServerCurrentPingTime = -1;
 	m_CurrentServerNextPingTime = -1;
 
-	ResetMapDownload(true);
+	ResetMapDownload();
+	m_aMapdownloadFilename[0] = '\0';
+	m_aMapdownloadFilenameTemp[0] = '\0';
+	m_aMapdownloadName[0] = '\0';
 
 	// clear the current server info
 	mem_zero(&m_CurrentServerInfo, sizeof(m_CurrentServerInfo));
@@ -707,7 +710,7 @@ bool CClient::DummyConnectingDelayed() const
 	return !DummyConnected() && !DummyConnecting() && m_LastDummyConnectTime > 0.0f && m_LastDummyConnectTime + 5.0f > GlobalTime();
 }
 
-void CClient::DummyConnect(bool Force)
+void CClient::DummyConnect()
 {
 	if(m_aNetClient[CONN_MAIN].State() != NETSTATE_ONLINE)
 	{
@@ -725,7 +728,7 @@ void CClient::DummyConnect(bool Force)
 		log_info("client", "Dummy is already connected/connecting.");
 		return;
 	}
-	if(!Force && DummyConnectingDelayed())
+	if(DummyConnectingDelayed())
 	{
 		log_info("client", "Wait before connecting dummy again.");
 		return;
@@ -1467,6 +1470,7 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 
 			m_MapDetailsPresent = true;
 			(void)MapSize;
+			str_copy(m_aPreviousMapDetailsName, m_aMapDetailsName);
 			str_copy(m_aMapDetailsName, pMap);
 			m_MapDetailsSha256 = *pMapSha256;
 			m_MapDetailsCrc = MapCrc;
@@ -1522,10 +1526,16 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 
 			if(m_DummyConnected)
 			{
+				if(str_comp(m_aMapDetailsName, m_aPreviousMapDetailsName) == 0)
+				{
+					m_DummyReconnectOnLoad = true;
+					m_DummySwapOnReconnect = g_Config.m_ClDummy == 1 ? false : true;
+				}
+
 				DummyDisconnect(0);
 			}
 
-			ResetMapDownload(true);
+			ResetMapDownload();
 
 			SHA256_DIGEST *pMapSha256 = nullptr;
 			const char *pMapUrl = nullptr;
@@ -1649,23 +1659,13 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 				}
 			}
 		}
-		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_MAP_RELOAD)
-		{
-			if(m_DummyConnected)
-			{
-				m_DummyReconnectOnLoad = true;
-				m_DummySwapOnReconnect = g_Config.m_ClDummy == 1 ? false : true;
-			}
-			else
-				m_DummySwapOnReconnect = false;
-		}
 		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_CON_READY)
 		{
 			GameClient()->OnConnected();
 			if(m_DummyReconnectOnLoad)
 			{
 				m_DummyReconnectOnLoad = false;
-				DummyConnect(true);
+				DummyConnect();
 			}
 		}
 		else if(Conn == CONN_DUMMY && Msg == NETMSG_CON_READY)
@@ -2208,7 +2208,7 @@ int CClient::UnpackAndValidateSnapshot(CSnapshot *pFrom, CSnapshot *pTo)
 	return Builder.Finish(pTo);
 }
 
-void CClient::ResetMapDownload(bool ResetActive)
+void CClient::ResetMapDownload()
 {
 	if(m_pMapdownloadTask)
 	{
@@ -2227,24 +2227,19 @@ void CClient::ResetMapDownload(bool ResetActive)
 		Storage()->RemoveFile(m_aMapdownloadFilenameTemp, IStorage::TYPE_SAVE);
 	}
 
-	if(ResetActive)
-	{
-		m_MapdownloadChunk = 0;
-		m_MapdownloadSha256Present = false;
-		m_MapdownloadSha256 = SHA256_ZEROED;
-		m_MapdownloadCrc = 0;
-		m_MapdownloadTotalsize = -1;
-		m_MapdownloadAmount = 0;
-		m_aMapdownloadFilename[0] = '\0';
-		m_aMapdownloadFilenameTemp[0] = '\0';
-		m_aMapdownloadName[0] = '\0';
-	}
+	m_MapdownloadChunk = 0;
+	m_MapdownloadSha256Present = false;
+	m_MapdownloadSha256 = SHA256_ZEROED;
+	m_MapdownloadCrc = 0;
+	m_MapdownloadTotalsize = -1;
+	m_MapdownloadAmount = 0;
 }
 
 void CClient::FinishMapDownload()
 {
 	m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client/network", "download complete, loading map");
 
+	const int PrevMapdownloadTotalsize = m_MapdownloadTotalsize;
 	SHA256_DIGEST *pSha256 = m_MapdownloadSha256Present ? &m_MapdownloadSha256 : nullptr;
 
 	bool FileSuccess = true;
@@ -2253,6 +2248,7 @@ void CClient::FinishMapDownload()
 	FileSuccess &= Storage()->RenameFile(m_aMapdownloadFilenameTemp, m_aMapdownloadFilename, IStorage::TYPE_SAVE);
 	if(!FileSuccess)
 	{
+		ResetMapDownload();
 		char aError[128 + IO_MAX_PATH_LENGTH];
 		str_format(aError, sizeof(aError), Localize("Could not save downloaded map. Try manually deleting this file: %s"), m_aMapdownloadFilename);
 		DisconnectWithReason(aError);
@@ -2262,17 +2258,19 @@ void CClient::FinishMapDownload()
 	const char *pError = LoadMap(m_aMapdownloadName, m_aMapdownloadFilename, pSha256, m_MapdownloadCrc);
 	if(!pError)
 	{
-		ResetMapDownload(true);
+		ResetMapDownload();
 		m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client/network", "loading done");
 		SendReady(CONN_MAIN);
 	}
 	else if(m_pMapdownloadTask) // fallback
 	{
-		ResetMapDownload(false);
+		ResetMapDownload();
+		m_MapdownloadTotalsize = PrevMapdownloadTotalsize;
 		SendMapRequest();
 	}
 	else
 	{
+		ResetMapDownload();
 		DisconnectWithReason(pError);
 	}
 }
@@ -2808,7 +2806,7 @@ void CClient::Update()
 		else if(m_pMapdownloadTask->State() == EHttpState::ERROR || m_pMapdownloadTask->State() == EHttpState::ABORTED)
 		{
 			dbg_msg("webdl", "http failed, falling back to gameserver");
-			ResetMapDownload(false);
+			ResetMapDownload();
 			SendMapRequest();
 		}
 	}

src/engine/client/client.h

@@ -156,6 +156,7 @@ class CClient : public IClient, public CDemoPlayer::IListener
 
 	bool m_MapDetailsPresent = false;
 	char m_aMapDetailsName[256] = "";
+	char m_aPreviousMapDetailsName[256] = "";
 	int m_MapDetailsCrc = 0;
 	SHA256_DIGEST m_MapDetailsSha256 = SHA256_ZEROED;
 	char m_aMapDetailsUrl[256] = "";
@@ -321,7 +322,7 @@ public:
 	void Disconnect() override;
 
 	void DummyDisconnect(const char *pReason) override;
-	void DummyConnect(bool Force = false) override;
+	void DummyConnect() override;
 	bool DummyConnected() const override;
 	bool DummyConnecting() const override;
 	bool DummyConnectingDelayed() const override;
@@ -362,7 +363,7 @@ public:
 
 	int UnpackAndValidateSnapshot(CSnapshot *pFrom, CSnapshot *pTo);
 
-	void ResetMapDownload(bool ResetActive);
+	void ResetMapDownload();
 	void FinishMapDownload();
 
 	void RequestDDNetInfo() override;

src/engine/server/server.cpp

@@ -3510,8 +3510,6 @@ void CServer::ConStopRecord(IConsole::IResult *pResult, void *pUser)
 void CServer::ConMapReload(IConsole::IResult *pResult, void *pUser)
 {
 	((CServer *)pUser)->m_MapReload = true;
-	CMsgPacker Msg(NETMSG_MAP_RELOAD, true);
-	((CServer *)pUser)->SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, -1);
 }
 
 void CServer::ConLogout(IConsole::IResult *pResult, void *pUser)

src/engine/shared/protocol_ex_msgs.h

@@ -35,4 +35,3 @@ UUID(NETMSG_CHECKSUM_ERROR, "checksum-error@ddnet.tw")
 UUID(NETMSG_REDIRECT, "redirect@ddnet.org")
 UUID(NETMSG_RCON_CMD_GROUP_START, "rcon-cmd-group-start@ddnet.org")
 UUID(NETMSG_RCON_CMD_GROUP_END, "rcon-cmd-group-end@ddnet.org")
-UUID(NETMSG_MAP_RELOAD, "map-reload@ddnet.org")

src/engine/textrender.h

@@ -93,7 +93,6 @@ MAYBE_UNUSED static const char *FONT_ICON_EARTH_AMERICAS = "\xEF\x95\xBD";
 MAYBE_UNUSED static const char *FONT_ICON_NETWORK_WIRED = "\xEF\x9B\xBF";
 MAYBE_UNUSED static const char *FONT_ICON_LIST_UL = "\xEF\x83\x8A";
 MAYBE_UNUSED static const char *FONT_ICON_INFO = "\xEF\x84\xA9";
-MAYBE_UNUSED static const char *FONT_ICON_TERMINAL = "\xEF\x84\xA0";
 
 MAYBE_UNUSED static const char *FONT_ICON_SLASH = "\xEF\x9C\x95";
 MAYBE_UNUSED static const char *FONT_ICON_PLAY = "\xEF\x81\x8B";

src/game/client/components/console.h

@@ -160,6 +160,8 @@ class CGameConsole : public CComponent
 	static const ColorRGBA ms_SearchHighlightColor;
 	static const ColorRGBA ms_SearchSelectedColor;
 
+	void Toggle(int Type);
+
 	static void PossibleCommandsRenderCallback(int Index, const char *pStr, void *pUser);
 	static void ConToggleLocalConsole(IConsole::IResult *pResult, void *pUserData);
 	static void ConToggleRemoteConsole(IConsole::IResult *pResult, void *pUserData);
@@ -194,7 +196,6 @@ public:
 	virtual bool OnInput(const IInput::CEvent &Event) override;
 	void Prompt(char (&aPrompt)[32]);
 
-	void Toggle(int Type);
 	bool IsClosed() { return m_ConsoleState == CONSOLE_CLOSED; }
 };
 #endif

src/game/client/components/menus_start.cpp

@@ -17,8 +17,6 @@
 
 #include "menus.h"
 
-using namespace FontIcons;
-
 void CMenus::RenderStartMenu(CUIRect MainView)
 {
 	GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_START);
@@ -188,27 +186,13 @@ void CMenus::RenderStartMenu(CUIRect MainView)
 	}
 
 	// render version
-	CUIRect CurVersion, ConsoleButton;
-	MainView.HSplitBottom(45.0f, nullptr, &CurVersion);
-	CurVersion.VSplitRight(40.0f, &CurVersion, nullptr);
-	CurVersion.HSplitTop(20.0f, &ConsoleButton, &CurVersion);
-	CurVersion.HSplitTop(5.0f, nullptr, &CurVersion);
-	ConsoleButton.VSplitRight(40.0f, nullptr, &ConsoleButton);
+	CUIRect VersionUpdate, CurVersion;
+	MainView.HSplitBottom(20.0f, nullptr, &VersionUpdate);
+	VersionUpdate.VSplitRight(50.0f, &CurVersion, nullptr);
+	VersionUpdate.VMargin(VMargin, &VersionUpdate);
+
 	Ui()->DoLabel(&CurVersion, GAME_RELEASE_VERSION, 14.0f, TEXTALIGN_MR);
 
-	static CButtonContainer s_ConsoleButton;
-	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
-	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-	if(DoButton_Menu(&s_ConsoleButton, FONT_ICON_TERMINAL, 0, &ConsoleButton, nullptr, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.1f)))
-	{
-		GameClient()->m_GameConsole.Toggle(CGameConsole::CONSOLETYPE_LOCAL);
-	}
-	TextRender()->SetRenderFlags(0);
-	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
-
-	CUIRect VersionUpdate;
-	MainView.HSplitBottom(20.0f, nullptr, &VersionUpdate);
-	VersionUpdate.VMargin(VMargin, &VersionUpdate);
 #if defined(CONF_AUTOUPDATE)
 	CUIRect UpdateButton;
 	VersionUpdate.VSplitRight(100.0f, &VersionUpdate, &UpdateButton);

src/game/server/gamecontext.cpp

@@ -3216,19 +3216,15 @@ void CGameContext::ConHotReload(IConsole::IResult *pResult, void *pUserData)
 		if(!pSelf->GetPlayerChar(i))
 			continue;
 
-		CCharacter *pChar = pSelf->GetPlayerChar(i);
-
 		// Save the tee individually
 		pSelf->m_apSavedTees[i] = new CSaveTee();
-		pSelf->m_apSavedTees[i]->Save(pChar, false);
+		pSelf->m_apSavedTees[i]->Save(pSelf->GetPlayerChar(i), false);
 
 		if(pSelf->m_apPlayers[i])
 			pSelf->m_apSavedTeleTees[i] = new CSaveTee(pSelf->m_apPlayers[i]->m_LastTeleTee);
 
 		// Save the team state
 		pSelf->m_aTeamMapping[i] = pSelf->GetDDRaceTeam(i);
-		if(pSelf->m_aTeamMapping[i] == TEAM_SUPER)
-			pSelf->m_aTeamMapping[i] = pChar->m_TeamBeforeSuper;
 
 		if(pSelf->m_apSavedTeams[pSelf->m_aTeamMapping[i]])
 			continue;
@@ -3237,8 +3233,6 @@ void CGameContext::ConHotReload(IConsole::IResult *pResult, void *pUserData)
 		pSelf->m_apSavedTeams[pSelf->m_aTeamMapping[i]]->Save(pSelf, pSelf->m_aTeamMapping[i], true, true);
 	}
 	pSelf->Server()->ReloadMap();
-	CMsgPacker Msg(NETMSG_MAP_RELOAD, true);
-	pSelf->Server()->SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, -1);
 }
 
 void CGameContext::ConAddVote(IConsole::IResult *pResult, void *pUserData)