matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'HEAD' of https://github.com/FacialTurd/The-Powder-Toy.git

Browse Source
This commit is contained in:
jacob1 2013-09-27 17:41:46 -04:00
commit c480c9ea19
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cat/TPTSTypes.cpp
View File

@ -48,6 +48,13 @@ AnyType::operator StringType()
{ {
return StringType(*((std::string*)value)); return StringType(*((std::string*)value));
} }
else if (type == TypePoint && value)
{
ui::Point thisPoint = *((ui::Point*)value);
std::stringstream pointStream;
pointStream << thisPoint.X << "," << thisPoint.Y;
return StringType(pointStream.str());
}
else else
throw InvalidConversionException(type, TypeString); throw InvalidConversionException(type, TypeString);
@ -61,10 +68,13 @@ AnyType::operator PointType()
} }
else if(type == TypeString) else if(type == TypeString)
{ {
ui::Point thisPoint = *((ui::Point*)value); std::stringstream pointStream(*((std::string*)value));
std::stringstream pointStream; int x, y;
pointStream << thisPoint.X << "," << thisPoint.Y; char comma;
return StringType(pointStream.str()); pointStream >> x >> comma >> y;
if (pointStream.fail() || comma != ',')
throw InvalidConversionException(type, TypePoint);
return PointType(ui::Point(x, y));
} }
else else
throw InvalidConversionException(type, TypePoint); throw InvalidConversionException(type, TypePoint);

2
src/cat/TPTScriptInterface.cpp
View File

@ -146,7 +146,7 @@ int TPTScriptInterface::parseNumber(char * stringData)
} }
else else
{ {
return atoi(stringData); return atof(stringData);
} }
return currentNumber; return currentNumber;
} }