From fa6f1c2a1e7b52c53b5599d5f85c719d7e249de6 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Mon, 13 Jul 2015 22:59:53 -0700 Subject: [PATCH] Remove unused (by client) plNetResManager. --- .../NucleusLib/pnNetCommon/CMakeLists.txt | 2 - .../pnNetCommon/plNetResManager.cpp | 102 ------------------ .../NucleusLib/pnNetCommon/plNetResManager.h | 66 ------------ 3 files changed, 170 deletions(-) delete mode 100644 Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp delete mode 100644 Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.h diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt index c8695f43..adacb3be 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt @@ -9,7 +9,6 @@ set(pnNetCommon_HEADERS plNetAddress.h plNetApp.h plNetGroup.h - plNetResManager.h plNetServers.h plNetSharedState.h plSDLTypes.h @@ -24,7 +23,6 @@ set(pnNetCommon_SOURCES plNetAddress.cpp plNetApp.cpp plNetGroup.cpp - plNetResManager.cpp plNetServers.cpp plNetSharedState.cpp plSDLTypes.cpp diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp deleted file mode 100644 index 8d5030bf..00000000 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp +++ /dev/null @@ -1,102 +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 . - -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==*/ -////////////////////////////////////////////////////////////////////////////// -// -// plNetResManager -// -//// Philosophy ////////////////////////////////////////////////////////////// -// -// "Cannot say. Saying, I would know. Do not know, so cannot say." -// -- Zathras, "Babylon 5" -// -// Normally, plResManager would be plenty for the servers and then some. -// However, the normal resManager tries to do things smart, such as read in -// keys from disk if they don't already exist and so forth. However, all the -// servers care about is reading in enough of a key to be able to turn around -// and write it back out to a stream. So, we overload ReadKeyAndReg() to just -// read in a new key and return it. Our new key reffing system will guarantee -// that the key eventually gets freed once we're done with it, and we don't -// care about sharing keys because all we're interested in is the uoid anyway, -// so no need to store the keys in the registry or anything. -// -////////////////////////////////////////////////////////////////////////////// - -#include "plNetResManager.h" -#include "pnKeyedObject/plKeyImp.h" -#include "pnKeyedObject/plUoid.h" -#include "pnKeyedObject/hsKeyedObject.h" -#include "pnFactory/plCreatable.h" -#include "pnNetCommon/plNetApp.h" -#include "hsStream.h" - -plNetResManager::plNetResManager() -{ -} - -plNetResManager::~plNetResManager() -{ -} - -plCreatable* plNetResManager::IReadCreatable(hsStream* s) const -{ - uint16_t hClass = s->ReadLE16(); - if (plFactory::CanCreate(hClass)) - { - plCreatable *pCre = plFactory::Create(hClass); - if (!pCre) - hsAssert(hClass == 0x8000, "Invalid creatable index"); - - return pCre; - } - - plNetApp::StaticWarningMsg(plFormat("NetResMgr::Can't create class {}", plFactory::GetNameOfClass(hClass))); - return nil; -} - -void plNetResManager::IKeyReffed(plKeyImp* key) -{ -} - -void plNetResManager::IKeyUnreffed(plKeyImp* key) -{ - delete key; -} diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.h b/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.h deleted file mode 100644 index 5d333426..00000000 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.h +++ /dev/null @@ -1,66 +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 . - -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==*/ -#ifndef plNetResMgr_h -#define plNetResMgr_h - -#include "plResMgr/plResManager.h" -#include "pnKeyedObject/plKey.h" - -// -// plNetResMgr - Keys? Disk? What? Nah, we'll just create new ones and give them to ya -// - -class hsStream; -class plNetResManager : public plResManager -{ -public: - plNetResManager(); - ~plNetResManager(); - -protected: - plCreatable* IReadCreatable(hsStream* s) const; - virtual void IKeyReffed(plKeyImp* key); - virtual void IKeyUnreffed(plKeyImp* key); -}; - - -#endif // plNetResMgr_h