Replaced the unused plNCAgeJoinerMsg with plResPatcherMsg

Sources/Plasma/NucleusLib/inc/plCreatableIndex.h

@@ -565,7 +565,7 @@ CLASS_INDEX_LIST_START
     CLASS_INDEX(plNetServerMsgFindVaultServer),
     CLASS_INDEX(plNetServerMsgFindVaultServerReply),
     CLASS_INDEX(plAvTaskSeekDoneMsg),
-    CLASS_INDEX(plNCAgeJoinerMsg),
+    CLASS_INDEX(plResPatcherMsg),
     CLASS_INDEX(plNetServerMsgVaultTask),
     CLASS_INDEX(plNetMsgVaultTask),
     CLASS_INDEX(plAgeLinkStruct),

Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt

@@ -29,7 +29,6 @@ set(plMessage_SOURCES
     plLOSRequestMsg.cpp
     plMatrixUpdateMsg.cpp
     plMultistageMsg.cpp
-    plNCAgeJoinerMsg.cpp
     plNetClientMgrMsg.cpp
     plNetCommMsgs.cpp
     plNetVoiceListMsg.cpp
@@ -92,7 +91,6 @@ set(plMessage_HEADERS
     plMessageCreatable.h
     plMovieMsg.h
     plMultistageMsg.h
-    plNCAgeJoinerMsg.h
     plNetClientMgrMsg.h
     plNetCommMsgs.h
     plNetOwnershipMsg.h
@@ -107,6 +105,7 @@ set(plMessage_HEADERS
     plRenderRequestMsg.h
     plReplaceGeometryMsg.h
     plResMgrHelperMsg.h
+    plResPatcherMsg.h
     plResponderMsg.h
     plRideAnimatedPhysMsg.h
     plRippleShapeMsg.h

Sources/Plasma/PubUtilLib/plMessage/plMessageCreatable.h

@@ -337,8 +337,8 @@ REGISTER_CREATABLE(plPreloaderMsg);
 #include "plNetClientMgrMsg.h"
 REGISTER_CREATABLE(plNetClientMgrMsg);
 
-#include "plNCAgeJoinerMsg.h"
-REGISTER_CREATABLE(plNCAgeJoinerMsg);
+#include "plResPatcherMsg.h"
+REGISTER_CREATABLE(plResPatcherMsg);
 
 #include "plAccountUpdateMsg.h"
 REGISTER_CREATABLE(plAccountUpdateMsg);

Sources/Plasma/PubUtilLib/plMessage/plNCAgeJoinerMsg.cpp

@@ -1,48 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011  Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
-      Cyan Worlds, Inc.
-      14617 N Newport Hwy
-      Mead, WA   99021
-
-*==LICENSE==*/
-/*****************************************************************************
-*
-*   $/Plasma20/Sources/Plasma/PubUtilLib/plMessage/plNCAgeJoinerMsg.cpp
-*   
-***/
-
-#include "plNCAgeJoinerMsg.h"

Sources/Plasma/PubUtilLib/plMessage/plResPatcherMsg.h

@@ -39,32 +39,36 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-/*****************************************************************************
-*
-*   $/Plasma20/Sources/Plasma/PubUtilLib/plMessage/plNCAgeJoinerMsg.h
-*   
-***/
-
-#ifndef PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLNCAGEJOINERMSG_H
-#define PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLNCAGEJOINERMSG_H
+#ifndef _PLMESSAGE_PLRESPATCHERMSG_H
+#define _PLMESSAGE_PLRESPATCHERMSG_H
 
+#include "HeadSpin.h"
 #include "pnMessage/plMessage.h"
 
+// This message is sent when plResPatcher has completed its async operation
+class plResPatcherMsg : public plMessage {
+    bool  fSuccess;
+    char* fError;
 
-class plNCAgeJoinerMsg : public plMessage {
 public:
-    enum {
-        kHACK_NotifyRcvdAllSDLStates,       // Just until the server is working again
-    };
+    plResPatcherMsg() : fSuccess(true), fError(nil) { SetBCastFlag(kBCastByExactType); }
+    plResPatcherMsg(bool success, const char* error) : fSuccess(success) 
+    {
+        SetBCastFlag(kBCastByExactType);
+        fError = hsStrcpy(error); 
+    }
     
-    unsigned type;
+    ~plResPatcherMsg() { delete[] fError; }
 
-    CLASSNAME_REGISTER(plNCAgeJoinerMsg);
-    GETINTERFACE_ANY(plNCAgeJoinerMsg, plMessage);
+    CLASSNAME_REGISTER(plResPatcherMsg);
+    GETINTERFACE_ANY(plResPatcherMsg, plMessage);
     
-    void Read (hsStream *, hsResMgr *) { FATAL("plNCAgeJoinerMsg::Read"); }
-    void Write (hsStream *, hsResMgr *) { FATAL("plNCAgeJoinerMsg::Write"); }
+    void Read (hsStream *, hsResMgr *) { FATAL("What the hell are you doing?"); }
+    void Write (hsStream *, hsResMgr *) { FATAL("What the hell are you doing?"); }
+
+    const char* GetError() const { return fError; }
+    bool Success() const { return fSuccess; }
 };
 
 
-#endif // PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLNCAGEJOINERMSG_H
+#endif // _PLMESSAGE_PLRESPATCHERMSG_H

Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp

@@ -61,7 +61,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plAvatar/plAvatarMgr.h"
 #include "plAvatar/plArmatureMod.h"
 #include "plFile/hsFiles.h"
-#include "plMessage/plNCAgeJoinerMsg.h"
 
 
 /*****************************************************************************