zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-02 10:11:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- tested and fixed game list loader.

Browse source
This commit is contained in:
Christoph Oelckers 2019-10-31 00:41:56 +01:00
parent 2a7beeff69
commit c6753a3fec
10 changed files with 148 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

11
source/common/utility/sc_man.cpp
View file

@ -167,8 +167,8 @@ void FScanner::Open (const char *name)
void FScanner::OpenFile (const char *name)
{
Close ();
auto fr = fopenFileReader(name, 0);
if (!fr.isOpen()) return;
FileReader fr;
if (!fr.OpenFile(name)) return;
auto data = fr.ReadPadded(1);
ScriptBuffer = data;
ScriptName = name; // This is used for error messages so the full file name is preferable
@ -631,7 +631,8 @@ bool FScanner::GetNumber ()
}
else
{
Number = strtol (String, &stopper, 0);
BigNumber = strtoll(String, &stopper, 0);
Number = (int)clamp(BigNumber, INT_MIN, INT_MAX);
if (*stopper != 0)
{
ScriptError ("SC_GetNumber: Bad numeric constant \"%s\".", String);
@ -682,11 +683,13 @@ bool FScanner::CheckNumber ()
}
else if (strcmp (String, "MAXINT") == 0)
{
BigNumber = INT64_MAX;
Number = INT_MAX;
}
else
{
Number = strtol (String, &stopper, 0);
BigNumber = strtoll (String, &stopper, 0);
Number = (int)clamp(BigNumber, INT_MIN, INT_MAX);
if (*stopper != 0)
{
UnGet();