upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-09 19:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #13090: Make movement_costs < 1 behave like movement_costs = 1

Browse Source
This commit is contained in:
Gunter Labes 2009-03-01 08:32:55 +00:00
parent 653e08fd97
commit 5f1f85679a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog
View File

@ -18,6 +18,7 @@ Version 1.5.11+svn:
* WML Engine:
* Fix incorrect or doubled "sighted" events when delaying shroud update
* Fix sometimes doubled "select" events
* Fixed bug #13090: Make movement_costs < 1 behave like movement_costs = 1
* Miscellaneous and bug fixes:
* Align all network buffers on 4 bytes

7
src/unit.cpp
View File

@ -38,6 +38,7 @@
#define LOG_UT LOG_STREAM(info, engine)
#define WRN_UT LOG_STREAM(warn, engine)
#define ERR_UT LOG_STREAM(err, engine)
#define WRN_CONFIG LOG_STREAM(warn, config)
#define ERR_CONFIG LOG_STREAM(err, config)
namespace {
@ -2118,7 +2119,7 @@ int unit::movement_cost_internal(const t_translation::t_terrain terrain, const i
int res = -1;
if(movement_costs != NULL) {
if(underlying.size() != 1) {
LOG_STREAM(err, config) << "terrain '" << terrain << "' has "
ERR_CONFIG << "terrain '" << terrain << "' has "
<< underlying.size() << " underlying names - 0 expected\n";
return impassable;
}
@ -2130,7 +2131,9 @@ int unit::movement_cost_internal(const t_translation::t_terrain terrain, const i
}
if(res <= 0) {
res = impassable;
WRN_CONFIG << "Terrain '" << terrain << "' has a movement cost of '"
<< res << "' which is '<= 0'; resetting to 1.\n";
res = 1;
}
movement_costs_.insert(std::pair<t_translation::t_terrain, int>(terrain,res));