← Back to team overview

widelands-dev team mailing list archive

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

 

SirVer has proposed merging lp:~widelands-dev/widelands/fix_overlays into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

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

Fixes the buildhelp.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_overlays into lp:widelands.
=== modified file 'src/wui/overlay_manager.h'
--- src/wui/overlay_manager.h	2016-01-03 21:51:01 +0000
+++ src/wui/overlay_manager.h	2016-01-05 14:40:07 +0000
@@ -65,8 +65,11 @@
 		Point hotspot;
 	};
 
+	// The function used to calculate overlays for the build help. The function
+	// needs to return the nodecaps of the field that correspond to the image
+	// that should be used.
 	using CallbackFn =
-		boost::function<bool(const Widelands::TCoords<Widelands::FCoords>& coordinates)>;
+		boost::function<int32_t(const Widelands::TCoords<Widelands::FCoords>& coordinates)>;
 
 	OverlayManager();
 


Follow ups