Don't use smart pointers in client_t

Unvanquished · Feb 12, 2015 · 0f2de16 · 0f2de16
1 parent 28655ac
commit 0f2de16
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/engine/server/server.h b/src/engine/server/server.h
@@ -184,7 +184,7 @@ typedef struct client_s
 
 	// downloading
 	char          downloadName[ MAX_QPATH ]; // if not empty string, we are downloading
-	std::shared_ptr<FS::File> download; // file being downloaded (Using shared_ptr to work around MSVC failing at infering move constructors)
+	FS::File*     download; // file being downloaded
 	int           downloadSize; // total bytes (can't use EOF because of paks)
 	int           downloadCount; // bytes sent
 	int           downloadClientBlock; // last block we sent to the client, awaiting ack

diff --git a/src/engine/server/sv_client.cpp b/src/engine/server/sv_client.cpp
@@ -689,6 +689,7 @@ static void SV_CloseDownload( client_t *cl )
 	// EOF
 	if ( cl->download )
 	{
+		delete cl->download;
 		cl->download = nullptr;
 	}
 
@@ -1066,7 +1067,7 @@ void SV_WriteDownloadToClient( client_t *cl, msg_t *msg )
 			const FS::PakInfo* pak = checksum ? FS::FindPak(name, version) : FS::FindPak(name, version, *checksum);
 			if (pak) {
 				try {
-					cl->download = std::make_shared<FS::File>(FS::RawPath::OpenRead(pak->path));
+					cl->download = new FS::File(FS::RawPath::OpenRead(pak->path));
 					cl->downloadSize = cl->download->Length();
 				} catch (std::system_error&) {
 					success = false;