[gnome-nibbles/arnaudb/modernize-code: 40/58] Make another variable private.

[Arnaud B. <arnaudb src gnome org>]

commit 63326bffe28b51110385b57ac91884a31d033280
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Fri May 29 15:47:30 2020 +0200

    Make another variable private.

 src/nibbles-game.vala |  9 ++++++++-
 src/nibbles-view.vala | 21 +++++++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/src/nibbles-game.vala b/src/nibbles-game.vala
index ff24e05..756fb3e 100644
--- a/src/nibbles-game.vala
+++ b/src/nibbles-game.vala
@@ -64,9 +64,10 @@ private class NibblesGame : Object
     /* Game models */
     public Gee.LinkedList<Worm> worms                       { internal get; default = new 
Gee.LinkedList<Worm> (); }
     public Boni boni                                        { internal get; default = new Boni (); }
-    public WarpManager warp_manager                         { internal get; default = new WarpManager (); }
     public Gee.HashMap<Worm, WormProperties?> worm_props    { internal get; default = new Gee.HashMap<Worm, 
WormProperties?> (); }
 
+    private WarpManager warp_manager = new WarpManager ();
+
     /* Game controls */
     internal bool is_running    { internal get; private set; default = false; }
     internal bool is_paused     { internal get; private set; default = false; }
@@ -80,6 +81,12 @@ private class NibblesGame : Object
     internal signal void log_score (int score, int level_reached);
     internal signal void animate_end_game ();
     internal signal void level_completed ();
+    internal signal void warp_added (int x, int y);
+
+    construct
+    {
+        warp_manager.warp_added.connect ((warp) => warp_added (warp.x, warp.y));
+    }
 
     internal NibblesGame (int tile_size, int start_level, int speed, bool fakes, bool no_random = false)
     {
diff --git a/src/nibbles-view.vala b/src/nibbles-view.vala
index bfbbca9..0ea5959 100644
--- a/src/nibbles-view.vala
+++ b/src/nibbles-view.vala
@@ -122,7 +122,7 @@ private class NibblesView : GtkClutter.Embed
 
     private Gee.HashMap<Worm,  WormActor>    worm_actors  = new Gee.HashMap<Worm,  WormActor> ();
     private Gee.HashMap<Bonus, BonusTexture> bonus_actors = new Gee.HashMap<Bonus, BonusTexture> ();
-    private Gee.HashMap<Warp,  WarpTexture>  warp_actors  = new Gee.HashMap<Warp,  WarpTexture> ();
+    private Gee.HashSet<WarpTexture>         warp_actors  = new Gee.HashSet<WarpTexture> ();
 
     /* Game being played */
     private NibblesGame _game;
@@ -140,7 +140,7 @@ private class NibblesView : GtkClutter.Embed
 
             _game.bonus_applied.connect (bonus_applied_cb);
 
-            _game.warp_manager.warp_added.connect (warp_added_cb);
+            _game.warp_added.connect (warp_added_cb);
 
             _game.animate_end_game.connect (animate_end_game_cb);
         }
@@ -215,7 +215,7 @@ private class NibblesView : GtkClutter.Embed
             actor.destroy ();
         bonus_actors.clear ();
 
-        foreach (var actor in warp_actors.values)
+        foreach (var actor in warp_actors)
             actor.destroy ();
         warp_actors.clear ();
 
@@ -505,8 +505,8 @@ private class NibblesView : GtkClutter.Embed
         foreach (var worm in game.worms)
             worm_actors.@get (worm).hide ();
 
-        foreach (var warp in game.warp_manager.warps)
-            warp_actors.@get (warp).hide ();
+        foreach (var actor in warp_actors)
+            actor.hide ();
 
         level.save_easing_state ();
         level.set_easing_mode (Clutter.AnimationMode.EASE_IN_QUAD);
@@ -800,7 +800,7 @@ private class NibblesView : GtkClutter.Embed
     * * Warps drawing
     \*/
 
-    private void warp_added_cb (Warp warp)
+    private void warp_added_cb (int x, int y)
     {
         var actor = new WarpTexture ();
         try
@@ -817,20 +817,17 @@ private class NibblesView : GtkClutter.Embed
         }
 
         actor.set_size (game.tile_size, game.tile_size);
-        actor.set_position (warp.x * game.tile_size, warp.y * game.tile_size);
+        actor.set_position (x * game.tile_size, y * game.tile_size);
 
         level.add_child (actor);
 
-        warp_actors.@set (warp, actor);
+        warp_actors.add (actor);
     }
 
     private void warps_rescale (int tile_size)
     {
-        foreach (var warp in game.warp_manager.warps)
-        {
-            var actor = warp_actors.@get (warp);
+        foreach (var actor in warp_actors)
             actor.set_size (tile_size, tile_size);
-        }
     }
 
     /*\