OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Clean up some crazy in plClientResMgr

Browse Source
This commit is contained in:
Michael Hansen
2014-01-12 18:12:43 -08:00
parent f1131bbb25
commit dceb911f25
2 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Sources/Plasma/PubUtilLib/plClientResMgr/plClientResMgr.cpp
View File

@ -59,28 +59,19 @@ plClientResMgr& plClientResMgr::Instance(void)
return theInstance;
}
plClientResMgr::plClientResMgr()
{
this->ClientResources = new std::map<std::string, plMipmap*>;
}
plClientResMgr::~plClientResMgr()
{
if (this->ClientResources) {
std::map<std::string, plMipmap*>::iterator it;
std::map<plString, plMipmap*>::iterator it;
for (it = this->ClientResources->begin(); it != this->ClientResources->end(); ++it) {
if (it->second)
it->second->UnRef();
}
delete this->ClientResources;
for (it = ClientResources.begin(); it != ClientResources.end(); ++it) {
if (it->second)
it->second->UnRef();
}
}
void plClientResMgr::ILoadResources(const char* resfile)
void plClientResMgr::ILoadResources(const plFileName& resfile)
{
if (!resfile) {
if (!resfile.IsValid()) {
return;
}
@ -98,10 +89,8 @@ void plClientResMgr::ILoadResources(const char* resfile)
for (int i = 0; i < num_resources; i++) {
plMipmap* res_data = NULL;
uint32_t res_size = 0;
char* tmp_name = in.ReadSafeStringLong();
std::string res_name = std::string(tmp_name);
std::string res_type = res_name.substr(res_name.length() - 4, 4);
delete[] tmp_name;
plString res_name = in.ReadSafeStringLong_TEMP();
plString res_type = res_name.Substr(res_name.GetSize() - 4, 4);
// Version 1 doesn't encode format, so we'll try some simple
// extension sniffing
@ -122,7 +111,7 @@ void plClientResMgr::ILoadResources(const char* resfile)
in.Skip(res_size);
}
(*this->ClientResources)[res_name] = res_data;
ClientResources[res_name] = res_data;
}
break;
@ -134,12 +123,12 @@ void plClientResMgr::ILoadResources(const char* resfile)
}
}
plMipmap* plClientResMgr::getResource(const char* resname)
plMipmap* plClientResMgr::getResource(const plString& resname)
{
plMipmap* resmipmap = NULL;
std::map<std::string, plMipmap*>::iterator it = this->ClientResources->find(resname);
plMipmap* resmipmap = nullptr;
std::map<plString, plMipmap*>::iterator it = ClientResources.find(resname);
if (it != this->ClientResources->end()) {
if (it != ClientResources.end()) {
resmipmap = it->second;
} else {
hsAssert(resmipmap, "Unknown client resource requested.");

11
Sources/Plasma/PubUtilLib/plClientResMgr/plClientResMgr.h
View File

@ -44,21 +44,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define _plClientResMgr_h
#include <map>
#include <string>
class plMipmap;
class plString;
class plFileName;
class plClientResMgr {
protected:
std::map<std::string, plMipmap*>* ClientResources;
std::map<plString, plMipmap*> ClientResources;
public:
plClientResMgr();
plClientResMgr() { }
~plClientResMgr();
void ILoadResources(const char* resfile);
void ILoadResources(const plFileName& resfile);
plMipmap* getResource(const char* resname);
plMipmap* getResource(const plString& resname);
static plClientResMgr& Instance(void);
};