games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Ouch. Thing was for branch only.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2011-09-27 22:03:43 +00:00
parent bdd66b6537
commit 623325ca61
21 changed files with 82 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/JsonNode.cpp
View File

@@ -107,7 +107,7 @@ bool & JsonNode::Bool()
return data.Bool;
}
double & JsonNode::Float()
float & JsonNode::Float()
{
setType(DATA_FLOAT);
return data.Float;
@@ -140,8 +140,8 @@ const bool & JsonNode::Bool() const
return data.Bool;
}
const double floatDefault = 0;
const double & JsonNode::Float() const
const float floatDefault = 0;
const float & JsonNode::Float() const
{
if (type == DATA_NULL)
return floatDefault;
@@ -562,7 +562,7 @@ bool JsonParser::extractFloat(JsonNode &node)
{
assert(input[pos] == '-' || (input[pos] >= '0' && input[pos] <= '9'));
bool negative=false;
double result=0;
float result=0;
if (input[pos] == '-')
{
@@ -583,7 +583,7 @@ bool JsonParser::extractFloat(JsonNode &node)
{
//extract fractional part
pos++;
double fractMult = 0.1;
float fractMult = 0.1;
if (input[pos] < '0' || input[pos] > '9')
return error("Decimal part expected!");