OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Merge pull request #138 from branan/patcher-cleanup

Browse Source 
Patcher cleanup
This commit is contained in:
Branan Purvine-Riley
2012-02-04 10:18:03 -08:00
parent 7519fe403b e6f3194833
commit 383ef67790
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.cpp
View File

@ -59,15 +59,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
class plResDownloadStream : public plZlibStream class plResDownloadStream : public plZlibStream
{ {
plOperationProgress* fProgress; plOperationProgress* fProgress;
char* fFilename;
bool fIsZipped; bool fIsZipped;
public: public:
plResDownloadStream(plOperationProgress* prog, const wchar_t* reqFile) plResDownloadStream(plOperationProgress* prog, const wchar_t* reqFile)
: fProgress(prog) : fProgress(prog), fFilename(nil)
{ {
fIsZipped = wcscmp(plFileUtils::GetFileExt(reqFile), L"gz") == 0; fIsZipped = wcscmp(plFileUtils::GetFileExt(reqFile), L"gz") == 0;
} }
~plResDownloadStream()
{
if (fFilename)
delete[] fFilename;
}
hsBool Open(const char* filename, const char* mode)
{
fFilename = hsStrcpy(filename);
return plZlibStream::Open(filename, mode);
}
uint32_t Write(uint32_t count, const void* buf) uint32_t Write(uint32_t count, const void* buf)
{ {
fProgress->Increment((float)count); fProgress->Increment((float)count);
@ -78,6 +91,7 @@ public:
} }
bool IsZipped() const { return fIsZipped; } bool IsZipped() const { return fIsZipped; }
void Unlink() const { plFileUtils::RemoveFile(fFilename); }
}; };
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -93,7 +107,6 @@ static void FileDownloaded(
if (((plResDownloadStream*)writer)->IsZipped()) if (((plResDownloadStream*)writer)->IsZipped())
plFileUtils::StripExt(name); // Kill off .gz plFileUtils::StripExt(name); // Kill off .gz
writer->Close(); writer->Close();
delete writer;
switch (result) switch (result)
{ {
@ -107,6 +120,7 @@ static void FileDownloaded(
// Continue down the warpath // Continue down the warpath
patcher->IssueRequest(); patcher->IssueRequest();
delete[] name; delete[] name;
delete writer;
return; return;
case kNetErrFileNotFound: case kNetErrFileNotFound:
PatcherLog(kError, " Download Failed: %s not found", name); PatcherLog(kError, " Download Failed: %s not found", name);
@ -119,8 +133,10 @@ static void FileDownloaded(
} }
// Failure case // Failure case
((plResDownloadStream*)writer)->Unlink();
patcher->Finish(false); patcher->Finish(false);
delete[] name; delete[] name;
delete writer;
} }
static void ManifestDownloaded( static void ManifestDownloaded(

16
Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp
View File

@ -47,6 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plNetTransport/plNetTransportMember.h" // OfferLinkToPlayer() #include "plNetTransport/plNetTransportMember.h" // OfferLinkToPlayer()
#include "plgDispatch.h" #include "plgDispatch.h"
#include "pnMessage/plClientMsg.h"
#include "pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "plMessage/plLinkToAgeMsg.h" #include "plMessage/plLinkToAgeMsg.h"
#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
@ -159,8 +160,21 @@ void plNetLinkingMgr::NCAgeJoinerCallback (
void * notify, void * notify,
void * userState void * userState
) { ) {
plNetLinkingMgr * lm = plNetLinkingMgr::GetInstance(); NCAgeJoinerCompleteNotify* params = (NCAgeJoinerCompleteNotify*)notify;
// Tell the user we failed to link.
// In the future, we might want to try graceful recovery (link back to Relto?)
if (!params->success) {
plNetClientMgr::StaticErrorMsg(params->msg);
hsMessageBox(params->msg, "Linking Error", hsMessageBoxNormal, hsMessageBoxIconError);
#ifdef PLASMA_EXTERNAL_RELEASE
plClientMsg* clientMsg = new plClientMsg(plClientMsg::kQuit);
clientMsg->Send(hsgResMgr::ResMgr()->FindKey(kClient_KEY));
#endif
return;
}
plNetLinkingMgr * lm = plNetLinkingMgr::GetInstance();
switch (type) { switch (type) {
case kAgeJoinerComplete: { case kAgeJoinerComplete: {
ASSERT(joiner == s_ageJoiner); ASSERT(joiner == s_ageJoiner);