mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-27 03:35:27 +00:00
Book parser: Fix comparison between signed and unsigned integer expressions
This commit is contained in:
parent
51cd2678ae
commit
4b1df64fba
@ -21,7 +21,7 @@ namespace MWGui
|
|||||||
{
|
{
|
||||||
/* BookTextParser */
|
/* BookTextParser */
|
||||||
BookTextParser::BookTextParser(const std::string & text)
|
BookTextParser::BookTextParser(const std::string & text)
|
||||||
: mIndex(-1), mText(text), mIgnoreNewlineTags(true), mIgnoreLineEndings(true)
|
: mIndex(0), mText(text), mIgnoreNewlineTags(true), mIgnoreLineEndings(true)
|
||||||
{
|
{
|
||||||
MWScript::InterpreterContext interpreterContext(NULL, MWWorld::Ptr()); // empty arguments, because there is no locals or actor
|
MWScript::InterpreterContext interpreterContext(NULL, MWWorld::Ptr()); // empty arguments, because there is no locals or actor
|
||||||
mText = Interpreter::fixDefinesBook(mText, interpreterContext);
|
mText = Interpreter::fixDefinesBook(mText, interpreterContext);
|
||||||
@ -47,16 +47,8 @@ namespace MWGui
|
|||||||
|
|
||||||
BookTextParser::Events BookTextParser::next()
|
BookTextParser::Events BookTextParser::next()
|
||||||
{
|
{
|
||||||
while (1)
|
while (mIndex < mText.size())
|
||||||
{
|
{
|
||||||
++mIndex;
|
|
||||||
|
|
||||||
if (mIndex >= mText.size())
|
|
||||||
{
|
|
||||||
flushBuffer();
|
|
||||||
return Event_EOF;
|
|
||||||
}
|
|
||||||
|
|
||||||
char ch = mText[mIndex];
|
char ch = mText[mIndex];
|
||||||
if (ch == '<')
|
if (ch == '<')
|
||||||
{
|
{
|
||||||
@ -93,6 +85,7 @@ namespace MWGui
|
|||||||
mIgnoreNewlineTags = false;
|
mIgnoreNewlineTags = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
++mIndex;
|
||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -106,8 +99,11 @@ namespace MWGui
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
++mIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
flushBuffer();
|
||||||
|
return Event_EOF;
|
||||||
}
|
}
|
||||||
|
|
||||||
void BookTextParser::flushBuffer()
|
void BookTextParser::flushBuffer()
|
||||||
|
@ -49,7 +49,7 @@ namespace MWGui
|
|||||||
void parseTag(std::string tag);
|
void parseTag(std::string tag);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int mIndex;
|
size_t mIndex;
|
||||||
std::string mText;
|
std::string mText;
|
||||||
std::string mReadyText;
|
std::string mReadyText;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user