mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-30 02:15:32 +00:00
Merge remote-tracking branch 'pakanek/master'
This commit is contained in:
commit
c40e753ea9
3 changed files with 7 additions and 4 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -18,3 +18,6 @@ CMakeLists.txt.user
|
|||
*.swp
|
||||
*.swo
|
||||
*.kate-swp
|
||||
.cproject
|
||||
.project
|
||||
.settings/
|
||||
|
|
|
@ -209,6 +209,7 @@ namespace MWScript
|
|||
|
||||
offset = script->mData.mNumShorts+script->mData.mNumLongs;
|
||||
size = script->mData.mNumFloats;
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
|
||||
#include "scanner.hpp"
|
||||
|
||||
#include <cassert>
|
||||
#include <cctype>
|
||||
#include <sstream>
|
||||
#include <algorithm>
|
||||
|
@ -163,10 +164,9 @@ namespace Compiler
|
|||
|
||||
bool Scanner::scanInt (char c, Parser& parser, bool& cont)
|
||||
{
|
||||
assert(c != '\0');
|
||||
std::string value;
|
||||
|
||||
value += c;
|
||||
bool empty = false;
|
||||
|
||||
bool error = false;
|
||||
|
||||
|
@ -175,7 +175,6 @@ namespace Compiler
|
|||
if (std::isdigit (c))
|
||||
{
|
||||
value += c;
|
||||
empty = false;
|
||||
}
|
||||
else if (std::isalpha (c) || c=='_')
|
||||
error = true;
|
||||
|
@ -190,7 +189,7 @@ namespace Compiler
|
|||
}
|
||||
}
|
||||
|
||||
if (empty || error)
|
||||
if (error)
|
||||
return false;
|
||||
|
||||
TokenLoc loc (mLoc);
|
||||
|
|
Loading…
Reference in a new issue