widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

kaputtnik has proposed merging lp:~widelands-dev/widelands/hotspot_fixes into lp:widelands.

Commit message:
Revert the changes introduced with bzr 8205 causing the hotspot of the flag in buildhelp get centered.

Additionally adapted the hotspot of atlantean tower and hightower.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1647274 in widelands: "Atlantean Tower + Hightower hotspots are off"
  https://bugs.launchpad.net/widelands/+bug/1647274
  Bug #1648075 in widelands: "flags of buildhelp overlay does not fit with roads"
  https://bugs.launchpad.net/widelands/+bug/1648075

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

Revert the changes introduced with bzr 8205 causing the hotspot of the flag in buildhelp get centered.

Additionally adapted the hotspot of atlantean tower and hightower.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/hotspot_fixes into lp:widelands.

=== modified file 'data/tribes/buildings/militarysites/atlanteans/tower/init.lua'
--- data/tribes/buildings/militarysites/atlanteans/tower/init.lua	2015-12-28 22:02:27 +0000
+++ data/tribes/buildings/militarysites/atlanteans/tower/init.lua	2016-12-09 10:05:43 +0000
@@ -32,7 +32,7 @@
    animations = {
       idle = {
          pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 55, 60 },
+         hotspot = { 46, 58 },
       }
    },
 

=== modified file 'data/tribes/buildings/militarysites/atlanteans/tower_high/init.lua'
--- data/tribes/buildings/militarysites/atlanteans/tower_high/init.lua	2015-12-28 22:02:27 +0000
+++ data/tribes/buildings/militarysites/atlanteans/tower_high/init.lua	2016-12-09 10:05:43 +0000
@@ -22,7 +22,7 @@
    animations = {
       idle = {
          pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 50, 73 },
+         hotspot = { 47, 78 },
       }
    },
 

=== modified file 'src/wui/field_overlay_manager.cc'
--- src/wui/field_overlay_manager.cc	2016-12-03 12:51:06 +0000
+++ src/wui/field_overlay_manager.cc	2016-12-09 10:05:43 +0000
@@ -39,7 +39,8 @@
 	   Vector2i(buildhelp_info->pic->width() / 2, buildhelp_info->pic->height() - 1);
 
 	const OverlayInfo* const buildhelp_infos_end = buildhelp_info + Widelands::Field::Buildhelp_None;
-	for (;; ++buildhelp_info, ++filename) {  // The other buildhelp overlays.
+	for (;;) {   // The other buildhelp overlays.
+		++buildhelp_info, ++filename;
 		if (buildhelp_info == buildhelp_infos_end)
 			break;
 		buildhelp_info->pic = g_gr->images().get(*filename);