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

Merge branch 'master' into serverini

Browse Source
This commit is contained in:
Michael Hansen
2011-04-13 09:50:23 -07:00
parent 6cebc32ce0 418d29fc34
commit 425b1379c1
3 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Sources/Plasma/Apps/plUruLauncher/Main.cpp
View File

@ -152,24 +152,6 @@ static wchar s_workingDir[MAX_PATH];
static CEvent s_statusEvent(kEventManualReset);
// List of files we need to delete from the client directory
#ifdef PLASMA_EXTERNAL_RELEASE
static const wchar * s_deleteFiles[] = {
L"NetDiag.exe",
L"UruExplorer.pdb",
L"UruExplorer.map",
};
#else
static const wchar * s_deleteFiles[] = {
L"NetDiag.exe",
};
#endif
/*****************************************************************************
*
* Local functions
@ -984,13 +966,6 @@ int __stdcall WinMain (
for (PathFind * path = paths.Ptr(); path != paths.Term(); ++path)
PathDeleteFile(path->name);
// Delete specified files
for (unsigned i = 0; i < arrsize(s_deleteFiles); ++i) {
StrCopy(fileSpec, s_workingDir, arrsize(fileSpec));
PathAddFilename(fileSpec, fileSpec, s_deleteFiles[i], arrsize(fileSpec));
PathDeleteFile(fileSpec);
}
SetConsoleCtrlHandler(CtrlHandler, TRUE);
InitAsyncCore(); // must do this before self patch, since it needs to connect to the file server

1
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCore.cpp
View File

@ -113,6 +113,7 @@ void ReportNetErrorTrans::Post () {
void ReportNetError (ENetProtocol protocol, ENetError error) {
ReportNetErrorTrans * trans = NEW(ReportNetErrorTrans)(protocol, error);
NetTransSend(trans);
trans->DecRef();
}
} using namespace Ngl;