Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Avoid potentially dangerous locale-dependent atof functions

Browse Source 
This was SVN commit r9639.
This commit is contained in:
Ykkrosh 2011-06-19 19:51:53 +00:00
parent 9b930d9617
commit 10481ca174
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/tools/atlas/AtlasObject/AtlasObject.h
View File

@ -136,6 +136,9 @@ public:
// Return the string value of this object
operator const wchar_t* () const;
// Return the floating point value of this object
double getDouble() const;
// Check whether the object contains anything (even if those things are empty)
bool defined() const { return (bool)p; }

12
source/tools/atlas/AtlasObject/AtlasObjectImpl.cpp
View File

@ -128,6 +128,18 @@ AtObj::operator const wchar_t* () const
return L"";
}
double AtObj::getDouble() const
{
double val = 0;
if (p)
{
std::wstringstream s;
s << p->value;
s >> val;
}
return val;
}
void AtObj::add(const char* key, AtObj& data)
{
if (!p)

12
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp
View File

@ -625,13 +625,13 @@ void PlayerSettingsControl::ReadFromEngine()
{
sCameraInfo info;
AtObj camPos = *player["StartingCamera"]["Position"];
info.pX = wxAtof(*camPos["x"]);
info.pY = wxAtof(*camPos["y"]);
info.pZ = wxAtof(*camPos["z"]);
info.pX = (float)(*camPos["x"]).getDouble();
info.pY = (float)(*camPos["y"]).getDouble();
info.pZ = (float)(*camPos["z"]).getDouble();
AtObj camRot = *player["StartingCamera"]["Rotation"];
info.rX = wxAtof(*camRot["x"]);
info.rY = wxAtof(*camRot["y"]);
info.rZ = wxAtof(*camRot["z"]);
info.rX = (float)(*camRot["x"]).getDouble();
info.rY = (float)(*camRot["y"]).getDouble();
info.rZ = (float)(*camRot["z"]).getDouble();
controls.page->SetCamera(info, true);
}