Commit 086c63b7 authored by Florian Blasius's avatar Florian Blasius 🤘

Update.

parent c4ba74ca
Pipeline #8082 failed with stages
in 2 minutes and 9 seconds
...@@ -45,7 +45,7 @@ impl Into<Box<dyn RenderObject>> for TileMapRenderObject { ...@@ -45,7 +45,7 @@ impl Into<Box<dyn RenderObject>> for TileMapRenderObject {
} }
impl RenderObject for TileMapRenderObject { impl RenderObject for TileMapRenderObject {
fn render_self(&self, context: &mut Context<'_>, _: &Point) { fn render_self(&self, context: &mut Context, _: &Point) {
let (bounds, camera, map, mut image) = { let (bounds, camera, map, mut image) = {
let widget = context.widget(); let widget = context.widget();
( (
......
...@@ -33,8 +33,9 @@ impl MapViewState { ...@@ -33,8 +33,9 @@ impl MapViewState {
} }
impl State for MapViewState { impl State for MapViewState {
fn update(&mut self, _: &mut Registry, ctx: &mut Context<'_>) { fn update(&mut self, _: &mut Registry, ctx: &mut Context) {
if let Some(action) = self.action { if let Some(action) = self.action {
// todo use same mechanism as in doit
match action { match action {
MapViewAction::OpenMenu => { MapViewAction::OpenMenu => {
ctx.push_event_by_window(GameEvent::OpenMenu); ctx.push_event_by_window(GameEvent::OpenMenu);
...@@ -112,7 +113,7 @@ impl MenuViewState { ...@@ -112,7 +113,7 @@ impl MenuViewState {
} }
impl State for MenuViewState { impl State for MenuViewState {
fn update(&mut self, _: &mut Registry, ctx: &mut Context<'_>) { fn update(&mut self, _: &mut Registry, ctx: &mut Context) {
if let Some(action) = self.action { if let Some(action) = self.action {
match action { match action {
MenuAction::Start => { MenuAction::Start => {
...@@ -246,7 +247,7 @@ impl State for GameViewState { ...@@ -246,7 +247,7 @@ impl State for GameViewState {
.expect("GameViewState.init: menu_view box could not be found."); .expect("GameViewState.init: menu_view box could not be found.");
} }
fn update(&mut self, _: &mut Registry, ctx: &mut Context<'_>) { fn update(&mut self, _: &mut Registry, ctx: &mut Context) {
if let Some(event) = self.event { if let Some(event) = self.event {
match event { match event {
GameEvent::OpenMenu => { GameEvent::OpenMenu => {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment