dont update dlman or dl progress overlay during gameplay

etternagame · Nov 22, 2018 · 01710d7 · 01710d7
1 parent e0054b8
commit 01710d7
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 24 deletions.
diff --git a/Themes/Til Death/BGAnimations/ScreenSystemLayer overlay/default.lua b/Themes/Til Death/BGAnimations/ScreenSystemLayer overlay/default.lua
@@ -56,6 +56,12 @@ local dltzoom = 0.5
 -- download queue/progress
 t[#t + 1] =
 	Def.ActorFrame {
+	PausingDownloadsMessageCommand=function(self)
+		self:visible(false)
+	end,
+	ResumingDownloadsMessageCommand=function(self)
+		self:visible(false)
+	end,
 	AllDownloadsCompletedMessageCommand = function(self)
 		self:visible(false)
 	end,

diff --git a/src/DownloadManager.cpp b/src/DownloadManager.cpp
@@ -428,6 +428,11 @@ void
 DownloadManager::UpdateDLSpeed(bool gameplay)
 {
 	this->gameplay = gameplay;
+	if (gameplay)
+		MESSAGEMAN->Broadcast("PausingDownloads");
+	else
+		MESSAGEMAN->Broadcast("ResumingDownloads");
+
 	UpdateDLSpeed();
 }
 
@@ -492,6 +497,8 @@ DownloadManager::Update(float fDeltaSeconds)
 {
 	if (!initialized)
 		init();
+	if (gameplay)
+		return;
 	UpdatePacks(fDeltaSeconds);
 	UpdateHTTP(fDeltaSeconds);
 	return;

diff --git a/src/ScreenInstallOverlay.cpp b/src/ScreenInstallOverlay.cpp
@@ -250,34 +250,36 @@ ScreenInstallOverlay::Update(float fDeltaTime)
 		DoInstalls(args);
 	}
 #if !defined(WITHOUT_NETWORKING)
-	static float lastDLProgressUpdate = 0;
-	lastDLProgressUpdate += fDeltaTime;
-	if (DLMAN->downloads.empty() || lastDLProgressUpdate < 0.5)
-		return;
-	lastDLProgressUpdate = 0;
-	Message msg("DLProgressAndQueueUpdate");
+	if (!DLMAN->gameplay) {
+		static float lastDLProgressUpdate = 0;
+		lastDLProgressUpdate += fDeltaTime;
+		if (DLMAN->downloads.empty() || lastDLProgressUpdate < 0.5)
+			return;
+		lastDLProgressUpdate = 0;
+		Message msg("DLProgressAndQueueUpdate");
 
-	vector<RString> dls;
-	for (auto& dl : DLMAN->downloads) {
-		dls.push_back(dl.second->Status());
-	}
-	msg.SetParam("dlsize", static_cast<int>(DLMAN->downloads.size()));
-	msg.SetParam("dlprogress", join("\n", dls));
+		vector<RString> dls;
+		for (auto& dl : DLMAN->downloads) {
+			dls.push_back(dl.second->Status());
+		}
+		msg.SetParam("dlsize", static_cast<int>(DLMAN->downloads.size()));
+		msg.SetParam("dlprogress", join("\n", dls));
 
-	if (!DLMAN->DownloadQueue.empty()) {
-		vector<RString> cue;
-		for (auto& q : DLMAN->DownloadQueue) {
-			cue.push_back(q.first->name);
+		if (!DLMAN->DownloadQueue.empty()) {
+			vector<RString> cue;
+			for (auto& q : DLMAN->DownloadQueue) {
+				cue.push_back(q.first->name);
+			}
+			msg.SetParam("queuesize",
+						 static_cast<int>(DLMAN->DownloadQueue.size()));
+			msg.SetParam("queuedpacks", join("\n", cue));
+		} else {
+			msg.SetParam("queuesize", 0);
+			msg.SetParam("queuedpacks", RString(""));
 		}
-		msg.SetParam("queuesize",
-					 static_cast<int>(DLMAN->DownloadQueue.size()));
-		msg.SetParam("queuedpacks", join("\n", cue));
-	} else {
-		msg.SetParam("queuesize", 0);
-		msg.SetParam("queuedpacks", RString(""));
+		MESSAGEMAN->Broadcast(msg);
 	}
-	MESSAGEMAN->Broadcast(msg);
-
+
 #endif
 }