Update engine submodule and refactor rendering functions in client and mapper scripts

Author: cvet

Engine

@@ -14,7 +14,6 @@ void InitClientMain()
     Game.OnLoop.Subscribe(loop);
     Game.OnMouseMove.Subscribe(mouse_move);
     Game.OnRenderIface.Subscribe(render_iface);
-    Game.OnRenderMap.Subscribe(render_map);
     Game.OnCritterIn.Subscribe(critter_in);
     Game.OnCritterOut.Subscribe(critter_out);
     Game.OnItemMapIn.Subscribe(item_map_in);
@@ -210,13 +209,6 @@ void render_iface()
      */
 }
 
-// //////////////////////////////////////////////////////////////////////////////////////////////////
-// Render map function. You can use DrawMap* functions only there.
-[[Event]]
-void render_map()
-{
-}
-
 // //////////////////////////////////////////////////////////////////////////////////////////////////
 // Called on something critter in/out game.
 [[Event]]

Scripts/ClientMain.fos

@@ -32,7 +32,7 @@ void ModuleInit()
     Game.OnCritterOut.Subscribe(OnCritterOut);
     Game.OnItemMapIn.Subscribe(OnItemMapIn);
     Game.OnItemMapOut.Subscribe(OnItemMapOut);
-    Game.OnRenderMapStage.Subscribe(OnRenderMapStage);
+    Game.OnRenderMap_AfterSprites.Subscribe(OnRenderMapAfterSprites);
 }
 
 [[Event]]
@@ -78,11 +78,8 @@ void OnItemContourChanged(Item item)
 }
 
 [[Event]]
-void OnRenderMapStage(Map map, MapRenderStage stage)
+void OnRenderMapAfterSprites(Map map, irect drawArea)
 {
-    if (stage != MapRenderStage::AfterSprites) {
-        return;
-    }
     if (HighlightedItems.isEmpty() && HighlightedCritters.isEmpty()) {
         return;
     }

Scripts/ContourPipeline.fos

@@ -12,7 +12,6 @@ void InitMapperMain()
     Game.OnStart.Subscribe(start);
     Game.OnFinish.Subscribe(finish);
     Game.OnRenderIface.Subscribe(render_iface);
-    Game.OnRenderMap.Subscribe(render_map);
     Game.OnMouseDown.Subscribe(mouse_down);
     Game.OnMouseUp.Subscribe(mouse_up);
     Game.OnMouseMove.Subscribe(mouse_move);
@@ -1514,14 +1513,6 @@ void render_iface()
     //
 }
 
-// //////////////////////////////////////////////////////////////////////////////////////////////////
-// Render map function. You can use DrawMap* functions only there. This drawing before 1 iface layer.
-[[Event]]
-void render_map()
-{
-    //
-}
-
 // //////////////////////////////////////////////////////////////////////////////////////////////////
 // Mouse behaviours. Click states look in _client_defines.fos, Mouse click states.
 // Return false to disable engine events.

Scripts/MapperMain.fos

@@ -338,14 +338,15 @@ Timer.DeltaTimeCap = 0
 
 View.ScreenWidth = 1024
 View.ScreenHeight = 768
-View.ShowCorners = False
-View.ShowSpriteBorders = False
 View.HideNativeCursor = True
 View.FadingDuration = 1000
 View.MapZoomEnabled = True
 View.MapDirectDraw = False
 View.DisableLighting = False
 View.DisableFog = True
+View.GlobalDayColorTime = 300 600 1140 1380
+View.GlobalDayColor = 18 128 103 51 18 128 95 40 53 128 86 29
+View.DisableIndoorMask = True
 View.SpritesZoomMin = 0.2
 View.SpritesZoomMax = 2.5
 View.MapZoomInProgress = False

TLA.fomain

@@ -1 +1 @@
-0.3.2
+0.3.3