Add OpenString to FScanner class

This commit is contained in:
Randy Heit 2015-04-22 17:34:36 -05:00
parent 3061bcf604
commit f7bd3acec4
3 changed files with 17 additions and 3 deletions

View file

@ -1061,7 +1061,7 @@ public:
if (tagstring.IsNotEmpty())
{
FScanner sc;
sc.OpenMem("tagstring", tagstring.GetChars(), tagstring.Len());
sc.OpenString("tagstring", tagstring);
// scan the string as long as valid numbers can be found
while (sc.CheckNumber())
{
@ -1536,7 +1536,7 @@ public:
if (tagstring.IsNotEmpty())
{
FScanner sc;
sc.OpenMem("tagstring", tagstring.GetChars(), tagstring.Len());
sc.OpenString("tagstring", tagstring);
// scan the string as long as valid numbers can be found
while (sc.CheckNumber())
{

View file

@ -195,9 +195,22 @@ void FScanner::OpenFile (const char *name)
//==========================================================================
void FScanner::OpenMem (const char *name, const char *buffer, int size)
{
OpenString(name, FString(buffer, size));
}
//==========================================================================
//
// FScanner :: OpenString
//
// Like OpenMem, but takes a string directly.
//
//==========================================================================
void FScanner::OpenString (const char *name, FString buffer)
{
Close ();
ScriptBuffer = FString(buffer, size);
ScriptBuffer = buffer;
ScriptName = name;
LumpNum = -1;
PrepareScript ();

View file

@ -21,6 +21,7 @@ public:
void Open(const char *lumpname);
void OpenFile(const char *filename);
void OpenMem(const char *name, const char *buffer, int size);
void OpenString(const char *name, FString buffer);
void OpenLumpNum(int lump);
void Close();