0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modified [set_variable] "divide"...

Browse source 
...so that it always performs a floating-point divide.

Modified other operations along the way since their semantic does not
depend on integer/floating-point choice.

Added an implicit demotion from floating-point values to integers.
This commit is contained in:
Guillaume Melquiond 2010-09-10 21:29:37 +00:00
parent e90737fd94
commit adcf00ced5
3 changed files with 8 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -101,6 +101,8 @@ Version 1.9.0+svn:
* Added "variations" key and "@V" symbol in [terrain_graphics] (syntax is
not final, and may change later)
* Fixed a bug causing the PUT_TO_RECALL_LIST macro to freeze the game.
* Modified [set_variable] "divide" so that it always performs a
floating-point divide.
* Miscellaneous and bug fixes:
* Removed: statistics upload code.
* Changed: compiler mode set to c++98

1
src/config.cpp
View file

@ -104,6 +104,7 @@ bool config::attribute_value::to_bool(bool def) const
int config::attribute_value::to_int(int def) const
{
if (const int *p = boost::get<const int>(&value)) return *p;
if (const double *p = boost::get<const double>(&value)) return int(*p);
return def;
}

35
src/game_events.cpp
View file

@ -1109,11 +1109,6 @@ WML_HANDLER_FUNCTION(move_units_fake, /*event_info*/, cfg)
LOG_WML << "Units removed\n";
}
// Helper function(s) for [set_variable]
static bool isint(const std::string &var) {
return var.find('.') == std::string::npos;
}
WML_HANDLER_FUNCTION(set_variable, /*event_info*/, cfg)
{
game_state *state_of_game = resources::state_of_game;
@ -1146,29 +1141,17 @@ WML_HANDLER_FUNCTION(set_variable, /*event_info*/, cfg)
config::attribute_value add = cfg["add"];
if (!add.empty()) {
if (isint(var.str()) && isint(add.str())) {
var = var.to_int() + add.to_int();
} else {
var = var.to_double() + add.to_double();
}
var = var.to_double() + add.to_double();
}
config::attribute_value sub = cfg["sub"];
if (!sub.empty()) {
if (isint(var.str()) && isint(sub.str())) {
var = var.to_int() - sub.to_int();
} else {
var = var.to_double() - sub.to_double();
}
var = var.to_double() - sub.to_double();
}
config::attribute_value multiply = cfg["multiply"];
if (!multiply.empty()) {
if (isint(var.str()) && isint(multiply.str())) {
var = var.to_int() * multiply.to_int();
} else {
var = var.to_double() * multiply.to_double();
}
var = var.to_double() * multiply.to_double();
}
config::attribute_value divide = cfg["divide"];
@ -1177,11 +1160,7 @@ WML_HANDLER_FUNCTION(set_variable, /*event_info*/, cfg)
ERR_NG << "division by zero on variable " << name << "\n";
return;
}
if (isint(var.str()) && isint(divide.str())) {
var = var.to_int() / divide.to_int();
} else {
var = var.to_double() / divide.to_double();
}
var = var.to_double() / divide.to_double();
}
config::attribute_value modulo = cfg["modulo"];
@ -1190,11 +1169,7 @@ WML_HANDLER_FUNCTION(set_variable, /*event_info*/, cfg)
ERR_NG << "division by zero on variable " << name << "\n";
return;
}
if (isint(var.str()) && isint(modulo.str())) {
var = var.to_int() % modulo.to_int();
} else {
var = std::fmod(var.to_double(), modulo.to_double());
}
var = std::fmod(var.to_double(), modulo.to_double());
}
config::attribute_value round_val = cfg["round"];