From 98834d4a12c4dbcc4ee894568a124bfb4f8ce262 Mon Sep 17 00:00:00 2001 From: Joseph Davies Date: Tue, 12 Apr 2011 22:24:12 -0700 Subject: [PATCH 1/3] Add README in reStructuredText format. --- README.rst | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 README.rst diff --git a/README.rst b/README.rst new file mode 100644 index 00000000..67e7769e --- /dev/null +++ b/README.rst @@ -0,0 +1,57 @@ +====== +Plasma +====== +A CMake-based fork of the GPLv3-licensed **CyanWorlds.com Engine** (Headspin/Plasma), with a focus on bug fixes, cross-platform compatibility, and enhanced features. + +For more information, see http://mystonline.com/developers/ + + +Related projects +---------------- +- moul-scripts - An updated repository of game scripts containing + bug-fixes and compatible with modern python interpreters for use with Plasma. +- dirtsand - An open-source Plasma-compatible server project. + + +Library Dependencies +-------------------- +Plasma currently utilizes the following third-party libraries: + +- Python 2.7 +- nVidia PhysX 2.6.4 +- Creative Labs' OpenAL SDK 1.1 +- Microsoft DirectX SDK + - November 2008 or + - June 2010 +- libOgg and libVorbis +- OpenSSL +- eXpat +- libJPEG +- speex +- zlib + +Reducing the use of proprietary libraries is a focus of development and should be expected to change. + + +Compiling Instructions +---------------------- +Currently, compilation only targets Windows systems and requires Visual Studio 2008 or Visual Studio 2010. + +Support for Visual Studio Express editions and other operating systems is planned. + +To compile: + +1) Start CMake-GUI +2) Select your clone of the repository as the source directory, and a build directory (such as .\build) +3) Click 'Configure' + If CMake cannot find required libraries (such as PhsyX or OpenAL) you may need to specify them manually: + Default locations are C:\\physx_2.6.4\\SDKs for **PHYSX_SDK_PATH**, while C:\\Program Files\\OpenAL 1.1 SDK\\include and C:\\Program Files\\OpenAL 1.1 SDK\\libs\\Win32\\OpenAL32.lib are **OPENAL_INCLUDE_DIR** and **OPENAL_LIBRARY**, respectively. Once you have set the missing paths, click 'Configure' again to complete this step. +4) Click 'Generate' to create the Visual Studio solution and associated projects. +5) Open the `Plasma.sln` Solution in Visual Studio and choose **Build->Build Solution**. + + +Additional Information +---------------------- +- Myst Online is available to play for free at http://mystonline.com/play/ +- For more information on this fork and more in-depth building instructions, see the Guild of Writers wiki: . +- This code was forked from the initial release repository at OpenUru.org \ No newline at end of file From 51bf621898e1b96d36697ad30c073cf130f589a1 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Wed, 13 Apr 2011 09:48:15 -0700 Subject: [PATCH 2/3] Don't delete my files for me --- Sources/Plasma/Apps/plUruLauncher/Main.cpp | 25 ---------------------- 1 file changed, 25 deletions(-) diff --git a/Sources/Plasma/Apps/plUruLauncher/Main.cpp b/Sources/Plasma/Apps/plUruLauncher/Main.cpp index 2a63b759..313700fe 100644 --- a/Sources/Plasma/Apps/plUruLauncher/Main.cpp +++ b/Sources/Plasma/Apps/plUruLauncher/Main.cpp @@ -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 From 418d29fc3465d8dc49e0f5c96d70a8fdad7405ce Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Wed, 13 Apr 2011 09:48:34 -0700 Subject: [PATCH 3/3] Fix a memory leak --- Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCore.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCore.cpp b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCore.cpp index be656850..3c50dd9e 100644 --- a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCore.cpp +++ b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCore.cpp @@ -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;