← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~widelands-dev/widelands/recalculate_seafaring_performance into lp:widelands

 

GunChleoc has proposed merging lp:~widelands-dev/widelands/recalculate_seafaring_performance into lp:widelands.

Commit message:
Skip recalculate_allows_seafaring more often when setting/unsetting port spaces via Lua

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/recalculate_seafaring_performance/+merge/364235

A small performance tweak for Build 21.

- When adding a port space and seafaring is already allowed, no need to check it again.
- When removing a port space and seafaring is already disallowed, no need to check it again.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/recalculate_seafaring_performance into lp:widelands.
=== modified file 'src/logic/map.cc'
--- src/logic/map.cc	2019-03-02 09:31:11 +0000
+++ src/logic/map.cc	2019-03-11 07:49:11 +0000
@@ -1434,8 +1434,10 @@
 		success = force || is_port_space_allowed(world, get_fcoords(c));
 		if (success) {
 			port_spaces_.insert(c);
+			recalculate_seafaring &= !allows_seafaring();
 		}
 	} else {
+		recalculate_seafaring &= allows_seafaring();
 		port_spaces_.erase(c);
 		success = true;
 	}


Follow ups