← Back to branch summary

~widelands-dev/widelands/trunk

« back to all changes in this revision

Viewing changes to src/editor/ui_menus/tool_set_terrain_options_menu.h

  • Committer: Wideland's Bunnybot
  • Date: 2017-01-31 11:17:14 UTC
  • mfrom: (8268.1.2 bug-1637386)
  • Revision ID: bunnybot@widelands.org-20170131111714-2kvi2ziprak9no3y
Merged lp:~widelands-dev/widelands/bug-1637386:
Make sure that soldier visiting other territory is not presented as an aggressor to a militarysite that belongs to an ally.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/editor/ui_menus/tool_set_terrain_options_menu.h
39
39
        virtual ~EditorToolSetTerrainOptionsMenu();
40
40
 
41
41
private:
42
 
        std::unique_ptr<
43
 
           CategorizedItemSelectionMenu<Widelands::TerrainDescription, EditorSetTerrainTool>>
44
 
           multi_select_menu_;
 
42
        std::unique_ptr<CategorizedItemSelectionMenu<Widelands::TerrainDescription,
 
43
                                                     EditorSetTerrainTool>> multi_select_menu_;
45
44
        std::vector<std::unique_ptr<const Image>> offscreen_images_;
46
45
};
47
46