mirror of https://github.com/ZDoom/qzdoom.git
Make FResourceLump::LumpNameSetup's argument an FString
This commit is contained in:
parent
bbbbb7ac9d
commit
2103fe2a14
|
@ -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;
|
||||||
|
|
|
@ -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();
|
||||||
|
|
Loading…
Reference in New Issue