TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-09 07:20:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into Xenon_Removal

Browse source
This commit is contained in:
Areloch 2017-04-18 20:47:43 -05:00 • committed by GitHub
commit dba8b5b327
124 changed files with 663 additions and 653 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/core/util/str.cpp
View file

@ -1620,7 +1620,7 @@ String String::GetTrailingNumber(const char* str, S32& number)
if ((*p == '-') || (*p == '_'))
number = -dAtoi(p + 1);
else
number = ((p == base.c_str()) ? dAtoi(p) : dAtoi(++p));
number = (isdigit(*p) && (p == base.c_str()) ? dAtoi(p) : dAtoi(++p));
// Remove space between the name and the number
while ((p > base.c_str()) && dIsspace(*(p-1)))