zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make FResourceLump::LumpNameSetup's argument an FString

This commit is contained in:
Randy Heit 2015-04-04 17:14:17 -05:00
parent bbbbb7ac9d
commit 2103fe2a14
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/resourcefiles/resourcefile.cpp
View File

@ -90,11 +90,10 @@ FResourceLump::~FResourceLump()
// //
//========================================================================== //==========================================================================
void FResourceLump::LumpNameSetup(const char *iname) void FResourceLump::LumpNameSetup(FString iname)
{ {
const char *lname = strrchr(iname,'/'); long slash = iname.LastIndexOf('/');
lname = (lname == NULL) ? iname : lname + 1; FString base = (slash >= 0) ? iname.Mid(slash + 1) : iname;
FString base = lname;
base = base.Left(base.LastIndexOf('.')); base = base.Left(base.LastIndexOf('.'));
uppercopy(Name, base); uppercopy(Name, base);
Name[8] = 0; Name[8] = 0;

2
src/resourcefiles/resourcefile.h
View File

@ -44,7 +44,7 @@ struct FResourceLump
virtual FileReader *NewReader(); virtual FileReader *NewReader();
virtual int GetFileOffset() { return -1; } virtual int GetFileOffset() { return -1; }
virtual int GetIndexNum() const { return 0; } virtual int GetIndexNum() const { return 0; }
void LumpNameSetup(const char *iname); void LumpNameSetup(FString iname);
void CheckEmbedded(); void CheckEmbedded();
void *CacheLump(); void *CacheLump();