OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added some utilities to cmdlib.cpp and changed its license to BSD, because no original Quake code is left here.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-11 12:17:28 +02:00
commit 58afc3d5b2
14 changed files with 126 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/console/c_expr.cpp
View file

@ -41,6 +41,7 @@
#include "c_dispatch.h"
#include "c_cvars.h"
#include "doomtype.h"
#include "cmdlib.h"
// MACROS ------------------------------------------------------------------
@ -82,7 +83,7 @@ bool IsFloat (const char *str);
// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
static FProduction *ParseExpression (FCommandLine &argv, int &parsept);
static const char *IsNum (const char *str);
static const char *CIsNum (const char *str);
static FStringProd *NewStringProd (const char *str);
static FStringProd *NewStringProd (size_t len);
static FDoubleProd *NewDoubleProd (double val);
@ -257,13 +258,13 @@ bool IsFloat (const char *str)
}
else
{
pt = IsNum (str);
pt = CIsNum (str);
if (pt == NULL)
return false;
}
if (*pt == '.')
{
pt = IsNum (pt+1);
pt = CIsNum (pt+1);
if (pt == NULL)
return false;
}
@ -272,7 +273,7 @@ bool IsFloat (const char *str)
pt++;
if (*pt == '+' || *pt == '-')
pt++;
pt = IsNum (pt);
pt = CIsNum (pt);
}
return pt != NULL && *pt == 0;
}
@ -283,7 +284,7 @@ bool IsFloat (const char *str)
//
//==========================================================================
static const char *IsNum (const char *str)
static const char *CIsNum (const char *str)
{
const char *start = str;